rev 4766 - trunk/packages/koffice/debian/patches

Isaac Clerencia isaac at costa.debian.org
Mon Oct 23 06:34:13 UTC 2006


Author: isaac
Date: 2006-10-23 06:31:12 +0000 (Mon, 23 Oct 2006)
New Revision: 4766

Modified:
   trunk/packages/koffice/debian/patches/98_buildprep.diff
Log:
Update buildprep for 1.6


Modified: trunk/packages/koffice/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/koffice/debian/patches/98_buildprep.diff	2006-10-23 01:46:14 UTC (rev 4765)
+++ trunk/packages/koffice/debian/patches/98_buildprep.diff	2006-10-23 06:31:12 UTC (rev 4766)
@@ -28,7 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5973,30 +5961,15 @@
+@@ -5970,30 +5958,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -64,7 +64,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -6056,7 +6029,7 @@
+@@ -6053,7 +6026,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -73,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6106,7 +6079,7 @@
+@@ -6103,7 +6076,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -82,7 +82,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -6126,7 +6099,7 @@
+@@ -6123,7 +6096,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -91,7 +91,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6146,6 +6119,7 @@
+@@ -6143,6 +6116,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -99,7 +99,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -6165,15 +6139,17 @@
+@@ -6162,15 +6136,17 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -119,7 +119,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6214,11 +6190,56 @@
+@@ -6211,11 +6187,56 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -176,7 +176,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6291,15 +6312,15 @@
+@@ -6288,15 +6309,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -195,7 +195,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6468,14 +6489,13 @@
+@@ -6465,14 +6486,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -212,7 +212,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6487,7 +6507,6 @@
+@@ -6484,7 +6504,6 @@
        esac
        ;;
      *64-bit*)
@@ -220,7 +220,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6521,6 +6540,22 @@
+@@ -6518,6 +6537,22 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -243,7 +243,7 @@
  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
  [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-@@ -6552,7 +6587,7 @@
+@@ -6549,7 +6584,7 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -252,7 +252,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6562,8 +6597,10 @@
+@@ -6559,8 +6594,10 @@
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
@@ -265,7 +265,7 @@
         $2=yes
       fi
     fi
-@@ -6589,11 +6626,16 @@
+@@ -6586,11 +6623,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -283,7 +283,7 @@
       else
         $2=yes
       fi
-@@ -6617,7 +6659,7 @@
+@@ -6614,7 +6656,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -292,7 +292,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6646,20 +6688,70 @@
+@@ -6643,20 +6685,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -369,7 +369,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.
-@@ -6676,7 +6768,7 @@
+@@ -6673,7 +6765,7 @@
  
  
  # _LT_AC_CHECK_DLFCN
@@ -378,7 +378,7 @@
  AC_DEFUN([_LT_AC_CHECK_DLFCN],
  [AC_CHECK_HEADERS(dlfcn.h)dnl
  ])# _LT_AC_CHECK_DLFCN
-@@ -6684,7 +6776,7 @@
+@@ -6681,7 +6773,7 @@
  
  # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
  #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -387,7 +387,7 @@
  AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "$cross_compiling" = yes; then :
-@@ -6750,17 +6842,19 @@
+@@ -6747,17 +6839,19 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -409,7 +409,7 @@
      esac
    else :
      # compilation failed
-@@ -6772,7 +6866,7 @@
+@@ -6769,7 +6863,7 @@
  
  
  # AC_LIBTOOL_DLOPEN_SELF
@@ -418,7 +418,7 @@
  AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "x$enable_dlopen" != xyes; then
-@@ -6809,7 +6903,7 @@
+@@ -6806,7 +6900,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -427,7 +427,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6843,7 +6937,7 @@
+@@ -6840,7 +6934,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -436,7 +436,7 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -6856,7 +6950,7 @@
+@@ -6853,7 +6947,7 @@
      ])
  
      if test "x$lt_cv_dlopen_self" = xyes; then
@@ -445,7 +445,7 @@
        AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
      	  lt_cv_dlopen_self_static, [dnl
  	  _LT_AC_TRY_DLOPEN_SELF(
-@@ -6898,20 +6992,13 @@
+@@ -6895,20 +6989,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -467,7 +467,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6923,13 +7010,18 @@
+@@ -6920,13 +7007,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -490,7 +490,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6988,8 +7080,8 @@
+@@ -6985,8 +7077,8 @@
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
  if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
@@ -501,7 +501,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -7046,7 +7138,7 @@
+@@ -7043,7 +7135,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -510,7 +510,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7059,7 +7151,7 @@
+@@ -7056,7 +7148,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -519,7 +519,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7069,7 +7161,20 @@
+@@ -7066,7 +7158,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -541,7 +541,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -7134,7 +7239,7 @@
+@@ -7131,7 +7236,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
    ;;
  
  beos*)
-@@ -7143,7 +7248,7 @@
+@@ -7140,7 +7245,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -559,7 +559,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7159,7 +7264,7 @@
+@@ -7156,7 +7261,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -568,7 +568,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7171,7 +7276,8 @@
+@@ -7168,7 +7273,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -578,7 +578,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7201,7 +7307,7 @@
+@@ -7198,7 +7304,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
        ;;
      esac
      ;;
-@@ -7224,7 +7330,7 @@
+@@ -7221,7 +7327,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -596,7 +596,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"`
-@@ -7247,7 +7353,7 @@
+@@ -7244,7 +7350,7 @@
    dynamic_linker=no
    ;;
  
@@ -605,7 +605,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7259,8 +7365,17 @@
+@@ -7256,8 +7362,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -625,7 +625,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7278,14 +7393,19 @@
+@@ -7275,14 +7390,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -647,7 +647,7 @@
    esac
    ;;
  
-@@ -7305,9 +7425,9 @@
+@@ -7302,9 +7422,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -659,7 +659,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7322,7 +7442,7 @@
+@@ -7319,7 +7439,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -668,7 +668,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7333,7 +7453,7 @@
+@@ -7330,7 +7450,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -677,7 +677,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7345,6 +7465,18 @@
+@@ -7342,6 +7462,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -696,7 +696,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -7395,22 +7527,19 @@
+@@ -7392,22 +7524,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -725,7 +725,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,
-@@ -7420,6 +7549,30 @@
+@@ -7417,6 +7546,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -756,7 +756,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7429,7 +7582,7 @@
+@@ -7426,7 +7579,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -765,7 +765,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7457,8 +7610,13 @@
+@@ -7454,8 +7607,13 @@
  
  openbsd*)
    version_type=sunos
@@ -780,7 +780,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
-@@ -7478,7 +7636,7 @@
+@@ -7475,7 +7633,7 @@
  
  os2*)
    libname_spec='$name'
@@ -789,7 +789,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7496,13 +7654,6 @@
+@@ -7493,13 +7651,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -803,7 +803,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -7528,7 +7679,7 @@
+@@ -7525,7 +7676,7 @@
    need_version=yes
    ;;
  
@@ -812,7 +812,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'
-@@ -7561,6 +7712,29 @@
+@@ -7558,6 +7709,29 @@
    fi
    ;;
  
@@ -842,7 +842,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7574,6 +7748,11 @@
+@@ -7571,6 +7745,11 @@
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -854,7 +854,7 @@
  ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
  
-@@ -7598,6 +7777,9 @@
+@@ -7595,6 +7774,9 @@
        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
      fi
    fi
@@ -864,7 +864,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -7624,7 +7806,9 @@
+@@ -7621,7 +7803,9 @@
  
        case $tagname in
        CXX)
@@ -875,7 +875,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7686,7 +7870,7 @@
+@@ -7683,7 +7867,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -884,7 +884,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7724,7 +7908,7 @@
+@@ -7721,7 +7905,7 @@
  
  # AC_DISABLE_SHARED
  # -----------------
@@ -893,7 +893,7 @@
  AC_DEFUN([AC_DISABLE_SHARED],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_ENABLE_SHARED(no)
-@@ -7860,7 +8044,7 @@
+@@ -7857,7 +8041,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -902,7 +902,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
-@@ -7970,7 +8154,7 @@
+@@ -7967,7 +8151,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,
@@ -911,7 +911,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'*)
-@@ -8002,7 +8186,7 @@
+@@ -7999,7 +8183,7 @@
  AC_DEFUN([AC_PROG_LD_GNU],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -920,7 +920,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -8029,6 +8213,15 @@
+@@ -8026,6 +8210,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -936,7 +936,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8062,44 +8255,36 @@
+@@ -8059,44 +8252,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -992,7 +992,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8115,7 +8300,7 @@
+@@ -8112,7 +8297,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -1001,7 +1001,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
-@@ -8131,43 +8316,27 @@
+@@ -8128,43 +8313,27 @@
    esac
    ;;
  
@@ -1057,7 +1057,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
-@@ -8186,32 +8355,22 @@
+@@ -8183,32 +8352,22 @@
    ;;
  
  openbsd*)
@@ -1093,7 +1093,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]]'
-@@ -8232,10 +8391,13 @@
+@@ -8229,10 +8388,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1108,7 +1108,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -8255,36 +8417,43 @@
+@@ -8252,36 +8414,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -1176,7 +1176,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi])
  NM="$lt_cv_path_NM"
-@@ -8316,13 +8485,13 @@
+@@ -8313,13 +8482,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1197,7 +1197,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8341,13 +8510,13 @@
+@@ -8338,13 +8507,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1218,7 +1218,7 @@
  # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
  AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-@@ -8385,10 +8554,21 @@
+@@ -8382,10 +8551,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8428,7 +8608,7 @@
+@@ -8425,7 +8605,7 @@
  
  
  # AC_LIBTOOL_RC
@@ -1250,7 +1250,7 @@
  # enable support for Windows resource files
  AC_DEFUN([AC_LIBTOOL_RC],
  [AC_REQUIRE([LT_AC_PROG_RC])
-@@ -8461,36 +8641,9 @@
+@@ -8458,36 +8638,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1290,7 +1290,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -8504,9 +8657,9 @@
+@@ -8501,9 +8654,9 @@
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
  AC_LIBTOOL_SYS_LIB_STRIP
@@ -1302,7 +1302,7 @@
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
  
-@@ -8515,7 +8668,7 @@
+@@ -8512,7 +8665,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1311,7 +1311,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8524,48 +8677,11 @@
+@@ -8521,48 +8674,11 @@
    fi
    ;;
  
@@ -1362,7 +1362,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8590,7 +8706,7 @@
+@@ -8587,7 +8703,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1371,7 +1371,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8602,6 +8718,7 @@
+@@ -8599,6 +8715,7 @@
  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1379,7 +1379,7 @@
  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
  _LT_AC_TAGVAR(module_cmds, $1)=
  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -8619,7 +8736,7 @@
+@@ -8616,7 +8733,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1388,7 +1388,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8629,11 +8746,15 @@
+@@ -8626,11 +8743,15 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -1405,7 +1405,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8644,18 +8765,18 @@
+@@ -8641,18 +8762,18 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -1427,7 +1427,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8673,8 +8794,8 @@
+@@ -8670,8 +8791,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
@@ -1438,7 +1438,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8700,7 +8821,7 @@
+@@ -8697,7 +8818,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.
@@ -1447,7 +1447,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8730,8 +8851,23 @@
+@@ -8727,8 +8848,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1473,7 +1473,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8748,7 +8884,7 @@
+@@ -8745,7 +8881,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1482,7 +1482,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`
-@@ -8767,8 +8903,12 @@
+@@ -8764,8 +8900,12 @@
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
@@ -1495,7 +1495,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8777,15 +8917,16 @@
+@@ -8774,15 +8914,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1516,7 +1516,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.
-@@ -8794,13 +8935,12 @@
+@@ -8791,13 +8932,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1532,7 +1532,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8809,21 +8949,31 @@
+@@ -8806,21 +8946,31 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1574,7 +1574,7 @@
  	;;
      esac
      ;;
-@@ -8832,12 +8982,12 @@
+@@ -8829,12 +8979,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1589,7 +1589,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8846,70 +8996,81 @@
+@@ -8843,70 +8993,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1723,7 +1723,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8920,14 +9081,14 @@
+@@ -8917,14 +9078,14 @@
  	;;
      esac
      ;;
@@ -1740,7 +1740,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8944,12 +9105,12 @@
+@@ -8941,12 +9102,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1756,7 +1756,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8958,11 +9119,11 @@
+@@ -8955,11 +9116,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.
@@ -1770,7 +1770,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8972,33 +9133,22 @@
+@@ -8969,33 +9130,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1811,7 +1811,7 @@
        ;;
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -9009,17 +9159,20 @@
+@@ -9006,17 +9156,20 @@
      esac
  
      case $cc_basename in
@@ -1838,7 +1838,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -9035,12 +9188,15 @@
+@@ -9032,12 +9185,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1858,7 +1858,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -9051,11 +9207,25 @@
+@@ -9048,11 +9204,25 @@
  	;;
      esac
      ;;
@@ -1886,7 +1886,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9066,9 +9236,9 @@
+@@ -9063,9 +9233,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1898,7 +1898,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9079,14 +9249,14 @@
+@@ -9076,14 +9246,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -1916,7 +1916,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9104,20 +9274,44 @@
+@@ -9101,20 +9271,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1967,7 +1967,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9145,7 +9339,7 @@
+@@ -9142,7 +9336,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1976,7 +1976,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9155,7 +9349,7 @@
+@@ -9152,7 +9346,7 @@
  	;;
      esac
      ;;
@@ -1985,7 +1985,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -9166,15 +9360,31 @@
+@@ -9163,15 +9357,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::"'
      ;;
@@ -2019,7 +2019,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9184,14 +9394,14 @@
+@@ -9181,14 +9391,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -2037,7 +2037,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9209,7 +9419,7 @@
+@@ -9206,7 +9416,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2046,7 +2046,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9228,13 +9438,13 @@
+@@ -9225,13 +9435,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -2062,7 +2062,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9243,17 +9453,17 @@
+@@ -9240,17 +9450,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -2084,7 +2084,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9272,7 +9482,7 @@
+@@ -9269,7 +9479,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2093,7 +2093,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9293,27 +9503,14 @@
+@@ -9290,27 +9500,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -2123,7 +2123,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9326,36 +9523,33 @@
+@@ -9323,36 +9520,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -2172,7 +2172,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9363,9 +9557,9 @@
+@@ -9360,9 +9554,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -2184,7 +2184,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9375,9 +9569,9 @@
+@@ -9372,9 +9566,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -2196,7 +2196,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9386,9 +9580,9 @@
+@@ -9383,9 +9577,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -2208,7 +2208,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9401,12 +9595,63 @@
+@@ -9398,12 +9592,63 @@
  	;;
      esac
      ;;
@@ -2274,7 +2274,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9443,8 +9688,6 @@
+@@ -9440,8 +9685,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2283,7 +2283,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9462,7 +9705,7 @@
+@@ -9459,7 +9702,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2292,7 +2292,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -9516,7 +9759,7 @@
+@@ -9513,7 +9756,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.
@@ -2301,7 +2301,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9556,7 +9799,7 @@
+@@ -9553,7 +9796,7 @@
         fi
         ;;
  
@@ -2310,7 +2310,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9592,13 +9835,37 @@
+@@ -9589,13 +9832,37 @@
  
  $rm -f confest.$objext
  
@@ -2349,7 +2349,7 @@
  # Ensure that the configuration vars for the C compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9642,12 +9909,16 @@
+@@ -9639,12 +9906,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2367,7 +2367,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9657,7 +9928,7 @@
+@@ -9654,7 +9925,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2376,7 +2376,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9665,8 +9936,10 @@
+@@ -9662,8 +9933,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2389,7 +2389,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9676,8 +9949,6 @@
+@@ -9673,8 +9946,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2398,7 +2398,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -9687,8 +9958,6 @@
+@@ -9684,8 +9955,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2407,7 +2407,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9717,20 +9986,27 @@
+@@ -9714,20 +9983,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2436,7 +2436,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
-@@ -9742,8 +10018,6 @@
+@@ -9739,8 +10015,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2445,7 +2445,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9753,7 +10027,7 @@
+@@ -9750,7 +10024,7 @@
  
  
  # AC_LIBTOOL_LANG_RC_CONFIG
@@ -2454,7 +2454,7 @@
  # Ensure that the configuration vars for the Windows resource compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -9777,11 +10051,16 @@
+@@ -9774,11 +10048,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2471,7 +2471,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9807,11 +10086,12 @@
+@@ -9804,11 +10083,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2486,7 +2486,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 \
-@@ -9861,7 +10141,7 @@
+@@ -9858,7 +10138,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2495,7 +2495,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9927,11 +10207,11 @@
+@@ -9924,11 +10204,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2509,7 +2509,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9962,6 +10242,12 @@
+@@ -9959,6 +10239,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2522,7 +2522,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9973,6 +10259,9 @@
+@@ -9970,6 +10256,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2532,7 +2532,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -9992,7 +10281,7 @@
+@@ -9989,7 +10278,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2541,7 +2541,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -10023,7 +10312,7 @@
+@@ -10020,7 +10309,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2550,7 +2550,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10038,7 +10327,7 @@
+@@ -10035,7 +10324,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2559,7 +2559,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10267,7 +10556,10 @@
+@@ -10264,7 +10553,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.
@@ -2571,7 +2571,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10309,9 +10601,6 @@
+@@ -10306,9 +10598,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2581,7 +2581,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'"
  
-@@ -10333,14 +10622,30 @@
+@@ -10330,14 +10619,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'"
    ;;
@@ -2614,7 +2614,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10358,14 +10663,17 @@
+@@ -10355,14 +10660,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2634,7 +2634,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10521,6 +10829,10 @@
+@@ -10518,6 +10826,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2645,7 +2645,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10529,7 +10841,7 @@
+@@ -10526,7 +10838,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2654,7 +2654,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10554,18 +10866,28 @@
+@@ -10551,18 +10863,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2686,7 +2686,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10573,22 +10895,22 @@
+@@ -10570,22 +10892,22 @@
  	    ;;
  	esac
  	;;
@@ -2715,7 +2715,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10601,9 +10923,13 @@
+@@ -10598,9 +10920,13 @@
  	    ;;
  	esac
  	;;
@@ -2730,7 +2730,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -10614,18 +10940,24 @@
+@@ -10611,18 +10937,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -2759,7 +2759,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10642,25 +10974,25 @@
+@@ -10639,25 +10971,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2790,7 +2790,7 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10674,24 +11006,15 @@
+@@ -10671,24 +11003,15 @@
  	;;
        psos*)
  	;;
@@ -2817,7 +2817,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10701,12 +11024,12 @@
+@@ -10698,12 +11021,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2832,7 +2832,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10716,7 +11039,7 @@
+@@ -10713,7 +11036,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2841,7 +2841,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10724,7 +11047,14 @@
+@@ -10721,7 +11044,14 @@
  	    ;;
  	esac
  	;;
@@ -2857,7 +2857,7 @@
  	;;
        vxworks*)
  	;;
-@@ -10771,6 +11101,11 @@
+@@ -10768,6 +11098,11 @@
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
        ;;
  
@@ -2869,7 +2869,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -10787,7 +11122,7 @@
+@@ -10784,7 +11119,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2878,7 +2878,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10813,6 +11148,16 @@
+@@ -10810,6 +11145,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2895,7 +2895,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10824,7 +11169,7 @@
+@@ -10821,7 +11166,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2904,7 +2904,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10848,12 +11193,19 @@
+@@ -10845,12 +11190,19 @@
        ;;
  
      linux*)
@@ -2925,7 +2925,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10868,15 +11220,15 @@
+@@ -10865,15 +11217,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2947,7 +2947,7 @@
        ;;
  
      sunos4*)
-@@ -10885,7 +11237,7 @@
+@@ -10882,7 +11234,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2956,7 +2956,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10898,6 +11250,17 @@
+@@ -10895,6 +11247,17 @@
        fi
        ;;
  
@@ -2974,7 +2974,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10925,7 +11288,7 @@
+@@ -10922,7 +11285,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2983,7 +2983,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10934,6 +11297,16 @@
+@@ -10931,6 +11294,16 @@
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -3000,7 +3000,7 @@
  ])
  
  
-@@ -10958,7 +11331,13 @@
+@@ -10955,7 +11328,13 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -3015,7 +3015,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10984,7 +11363,7 @@
+@@ -10981,7 +11360,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -3024,7 +3024,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -11001,7 +11380,8 @@
+@@ -10998,7 +11377,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -3034,7 +3034,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11011,6 +11391,10 @@
+@@ -11008,6 +11388,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -3045,7 +3045,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -11021,6 +11405,27 @@
+@@ -11018,6 +11402,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -3073,7 +3073,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11058,7 +11463,7 @@
+@@ -11055,7 +11460,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -3082,7 +3082,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11068,13 +11473,13 @@
+@@ -11065,13 +11470,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -3099,7 +3099,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -11083,23 +11488,70 @@
+@@ -11080,23 +11485,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -3176,7 +3176,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<EOF 1>&2
-@@ -11113,13 +11565,40 @@
+@@ -11110,13 +11562,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3219,7 +3219,7 @@
      sunos4*)
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -11129,24 +11608,19 @@
+@@ -11126,24 +11605,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3251,7 +3251,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11158,7 +11632,7 @@
+@@ -11155,7 +11629,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3260,7 +3260,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11180,9 +11654,21 @@
+@@ -11177,9 +11651,21 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -3284,7 +3284,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11199,7 +11685,7 @@
+@@ -11196,7 +11682,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3293,7 +3293,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`
-@@ -11218,8 +11704,12 @@
+@@ -11215,8 +11701,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3306,7 +3306,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11227,30 +11717,30 @@
+@@ -11224,30 +11714,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3348,7 +3348,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11259,13 +11749,11 @@
+@@ -11256,13 +11746,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3365,7 +3365,7 @@
  	fi
        fi
        ;;
-@@ -11278,7 +11766,7 @@
+@@ -11275,7 +11763,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3374,7 +3374,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11288,69 +11776,69 @@
+@@ -11285,69 +11773,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3490,7 +3490,7 @@
        ;;
  
      dgux*)
-@@ -11383,16 +11871,25 @@
+@@ -11380,16 +11868,25 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3519,7 +3519,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11406,47 +11903,62 @@
+@@ -11403,47 +11900,62 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        ;;
  
@@ -3606,7 +3606,7 @@
  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
-@@ -11460,7 +11972,7 @@
+@@ -11457,7 +11969,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -3615,7 +3615,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11470,7 +11982,7 @@
+@@ -11467,7 +11979,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -3624,7 +3624,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11493,7 +12005,8 @@
+@@ -11490,7 +12002,8 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -3634,7 +3634,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11503,7 +12016,7 @@
+@@ -11500,7 +12013,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -3643,7 +3643,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11514,14 +12027,14 @@
+@@ -11511,14 +12024,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -3660,7 +3660,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11533,13 +12046,13 @@
+@@ -11530,13 +12043,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -3676,7 +3676,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11547,21 +12060,15 @@
+@@ -11544,21 +12057,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3702,7 +3702,7 @@
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -11570,8 +12077,18 @@
+@@ -11567,8 +12074,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3723,7 +3723,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11580,7 +12097,7 @@
+@@ -11577,7 +12094,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.
@@ -3732,7 +3732,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11628,36 +12145,45 @@
+@@ -11625,36 +12142,45 @@
        fi
        ;;
  
@@ -3799,7 +3799,7 @@
        ;;
  
      uts4*)
-@@ -11675,11 +12201,6 @@
+@@ -11672,11 +12198,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3811,7 +3811,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -11700,13 +12221,14 @@
+@@ -11697,13 +12218,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3827,7 +3827,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -11834,7 +12356,7 @@
+@@ -11831,7 +12353,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
@@ -3838,15 +3838,7 @@
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 --- autocorrect/Makefile.in
 +++ autocorrect/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3856,70 +3848,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -532,7 +541,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -3928,7 +3857,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +579,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3940,682 +3869,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- config.h.in
-+++ config.h.in
-@@ -233,22 +233,22 @@
- /* Define the PREFIX where to install this package */
- #undef PREFIX
- 
--/* The size of a `char *', as computed by sizeof. */
-+/* The size of `char *', as computed by sizeof. */
- #undef SIZEOF_CHAR_P
- 
--/* The size of a `int', as computed by sizeof. */
-+/* The size of `int', as computed by sizeof. */
- #undef SIZEOF_INT
- 
--/* The size of a `long', as computed by sizeof. */
-+/* The size of `long', as computed by sizeof. */
- #undef SIZEOF_LONG
- 
--/* The size of a `short', as computed by sizeof. */
-+/* The size of `short', as computed by sizeof. */
- #undef SIZEOF_SHORT
- 
--/* The size of a `size_t', as computed by sizeof. */
-+/* The size of `size_t', as computed by sizeof. */
- #undef SIZEOF_SIZE_T
- 
--/* The size of a `unsigned long', as computed by sizeof. */
-+/* The size of `unsigned long', as computed by sizeof. */
- #undef SIZEOF_UNSIGNED_LONG
- 
- /* Define to 1 if you have the ANSI C header files. */
 --- configure
 +++ configure
-@@ -1,8 +1,9 @@
+@@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.59e.
+-# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.60a.
  #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -16,11 +17,35 @@
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -571,15 +571,15 @@
  
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -29,8 +54,43 @@
- fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +104,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -63,157 +124,386 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# CDPATH.
-+$as_unset CDPATH
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
-+if test "x$CONFIG_SHELL" = x; then
-+  if (eval ":") 2>/dev/null; then
-+  as_have_required=yes
-+else
-+  as_have_required=no
- fi
- 
-+  if test $as_have_required = yes && 	 (eval ":
-+(as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+  as_lineno_1=\$LINENO
-+  as_lineno_2=\$LINENO
-+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+  :
-+else
-+  as_candidate_shells=
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
-+  case $as_dir in
- 	 /*)
--	   if ("$as_dir/$as_base" -c '
-+	   for as_base in sh bash ksh sh5; do
-+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	   done;;
-+       esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells which exist, to save several forks.
-+	 if test -f "$as_shell" &&
-+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+_ASEOF
-+}; then
-+  CONFIG_SHELL=$as_shell
-+	       as_have_required=yes
-+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+  emulate sh
-+  NULLCMD=:
-+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+(as_func_return () {
-+  (exit $1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+  break
-+fi
-+
-+fi
-+
-+      done
-+
-+      if test "x$CONFIG_SHELL" != x; then
-+  for as_var in BASH_ENV ENV
-+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+        done
-+        export CONFIG_SHELL
-+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+    if test $as_have_required = no; then
-+  echo This script requires a shell more modern than all the
-+      echo shells that I found on your system.  Please install a
-+      echo modern shell, or manually run the script under such a
-+      echo shell if you do have one.
-+      { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+  (exit \$1)
-+}
-+as_func_success () {
-+  as_func_return 0
-+}
-+as_func_failure () {
-+  as_func_return 1
-+}
-+as_func_ret_success () {
-+  return 0
-+}
-+as_func_ret_failure () {
-+  return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+  exitcode=1
-+  echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+  :
-+else
-+  exitcode=1
-+  echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+  echo No shell found that supports shell functions.
-+  echo Please tell autoconf at gnu.org about your system,
-+  echo including any error possibly output before this
-+  echo message
-+}
-+
-+
-+
-+  as_lineno_1=$LINENO
-+  as_lineno_2=$LINENO
-+  test "x$as_lineno_1" != "x$as_lineno_2" &&
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
-+  chmod +x "$as_me.lineno" ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -222,7 +512,19 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,15 +533,6 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- 
- 
- # Check that we are running under the correct shell.
-@@ -278,15 +571,15 @@
- 
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
 -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
@@ -4633,966 +3898,64 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -395,29 +688,26 @@
- 
- tagnames=${tagnames+${tagnames},}F77
- 
-+exec 7<&0 </dev/null 6>&1
-+
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete.  It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -455,17 +745,500 @@
+@@ -720,36 +720,36 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
  #endif
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
  # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
-+#endif
-+#if HAVE_STDINT_H
-+# include <stdint.h>
  #endif
- #if HAVE_UNISTD_H
+-#if HAVE_STDINT_H
++#ifdef HAVE_STDINT_H
+ # include <stdint.h>
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIBMAGICK_LIBS LIBMAGICK_LDFLAGS LIBMAGICK_CPPFLAGS LIBMAGICK_RPATH include_imagemagick_filter_TRUE include_imagemagick_filter_FALSE need_kde32_compatibility_TRUE need_kde32_compatibility_FALSE need_kde33_compatibility_TRUE need_kde33_compatibility_FALSE need_kde34_compatibility_TRUE need_kde34_compatibility_FALSE need_kde351_compatibility_TRUE need_kde351_compatibility_FALSE need_kde31_compatibility_TRUE need_kde31_compatibility_FALSE OPENEXR_LIBS OPENEXR_CFLAGS OPENEXR_RPATH have_openexr_TRUE have_openexr_FALSE LIBTIFF have_tiff_TRUE have_tiff_FALSE have_png_TRUE have_png_FALSE have_jpeg_TRUE have_jpeg_FALSE PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS have_exif_TRUE have_exif_FALSE include_jpeg_filter_TRUE include_jpeg_filter_FALSE include_tiff_filter_TRUE include_tiff_filter_FALSE LIBWV2_LIBS LIBWV2_CFLAGS LIBWV2_RPATH include_wv2_msword_filter_TRUE include_wv2_msword_filter_FALSE LIBPAPER LIBWPD_LIBS LIBWPD_CFLAGS LIBWPD_RPATH include_wpd_filter_TRUE include_wpd_filter_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH include_XSLTFILTERS_TRUE include_XSLTFILTERS_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH LIBART_LIBS LIBART_CFLAGS LIBART_RPATH LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH have_readline_TRUE have_readline_FALSE LIBREADLINE LIB_KEXI_KMDI LIB_KEXI_KMDI_INCLUDES MYSQL_INC MYSQL_LIBS compile_mysql_plugin_TRUE compile_mysql_plugin_FALSE PG_INCDIR PG_LIBDIR compile_pgsql_plugin_TRUE compile_pgsql_plugin_FALSE PQXX_INCDIR PQXX_LIBDIR LIB_KFEEDBACK INC_KFEEDBACK use_kexifeedback_TRUE use_kexifeedback_FALSE PYTHONINC PYTHONLIB LIBPYTHON PYTHONMODDIR LIB_XINPUTEXT LCMS_LIBS include_kunittest_tests_TRUE include_kunittest_tests_FALSE GLINC GLLIB use_kjsembed_TRUE use_kjsembed_FALSE SQLDIR include_sql_TRUE include_sql_FALSE KWMF_INCLUDES KSTORE_INCLUDES KOTEXT_INCLUDES KOPAINTER_INCLUDES KOPALETTE_INCLUDES KOFFICECORE_INCLUDES KOFFICEUI_INCLUDES KFORMULA_INCLUDES KOPROPERTY_INCLUDES KROSS_INCLUDES LIB_KOFFICEUI LIB_KOFFICECORE LIB_KSTORE LIB_KOTEXT LIB_KOPAINTER LIB_KOPALETTE LIB_KWMF LIB_KOWMF LIB_KFORMULA LIB_KOPROPERTY LIB_KROSS_API LIB_KROSS_MAIN interfacedir KOFFICE_LIBS KOFFICE_INCLUDES LIBKSPELL2 compile_kross_TRUE compile_kross_FALSE compile_kross_python_TRUE compile_kross_python_FALSE RUBY RUBY_ARCHDIR RUBY_SITEARCHDIR RUBY_SITEDIR RUBY_INCLUDEDIR RUBY_LIBDIR RUBY_LIBRUBYARG RUBY_ENABLESHARED compile_kross_ruby_TRUE compile_kross_ruby_FALSE TOPSUBDIRS lib_SUBDIR_included_TRUE lib_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE autocorrect_SUBDIR_included_TRUE autocorrect_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE example_SUBDIR_included_TRUE example_SUBDIR_included_FALSE karbon_SUBDIR_included_TRUE karbon_SUBDIR_included_FALSE kchart_SUBDIR_included_TRUE kchart_SUBDIR_included_FALSE kdgantt_SUBDIR_included_TRUE kdgantt_SUBDIR_included_FALSE kformula_SUBDIR_included_TRUE kformula_SUBDIR_included_FALSE kivio_SUBDIR_included_TRUE kivio_SUBDIR_included_FALSE koshell_SUBDIR_included_TRUE koshell_SUBDIR_included_FALSE kounavail_SUBDIR_included_TRUE kounavail_SUBDIR_included_FALSE kpresenter_SUBDIR_included_TRUE kpresenter_SUBDIR_included_FALSE krita_SUBDIR_included_TRUE krita_SUBDIR_included_FALSE kspread_SUBDIR_included_TRUE kspread_SUBDIR_included_FALSE kugar_SUBDIR_included_TRUE kugar_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE plugins_SUBDIR_included_TRUE plugins_SUBDIR_included_FALSE servicetypes_SUBDIR_included_TRUE servicetypes_SUBDIR_included_FALSE templates_SUBDIR_included_TRUE templates_SUBDIR_included_FALSE tools_SUBDIR_included_TRUE tools_SUBDIR_included_FALSE kword_SUBDIR_included_TRUE kword_SUBDIR_included_FALSE kplato_SUBDIR_included_TRUE kplato_SUBDIR_included_FALSE kexi_SUBDIR_included_TRUE kexi_SUBDIR_included_FALSE filters_SUBDIR_included_TRUE filters_SUBDIR_included_FALSE compile_filter_KWORD_TRUE compile_filter_KWORD_FALSE compile_filter_KSPREAD_TRUE compile_filter_KSPREAD_FALSE compile_filter_KCHART_TRUE compile_filter_KCHART_FALSE compile_filter_KARBON_TRUE compile_filter_KARBON_FALSE compile_filter_KPRESENTER_TRUE compile_filter_KPRESENTER_FALSE compile_filter_KFORMULA_TRUE compile_filter_KFORMULA_FALSE compile_filter_KUGAR_TRUE compile_filter_KUGAR_FALSE compile_filter_KRITA_TRUE compile_filter_KRITA_FALSE compile_filter_KIVIO_TRUE compile_filter_KIVIO_FALSE compile_plugin_KUGAR_TRUE compile_plugin_KUGAR_FALSE compile_kexionly_TRUE compile_kexionly_FALSE compile_lib_KOPAINTER_TRUE compile_lib_KOPAINTER_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+build
-+build_cpu
-+build_vendor
-+build_os
-+host
-+host_cpu
-+host_vendor
-+host_os
-+target
-+target_cpu
-+target_vendor
-+target_os
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CYGPATH_W
-+PACKAGE
-+VERSION
-+ACLOCAL
-+AUTOCONF
-+AUTOMAKE
-+AUTOHEADER
-+MAKEINFO
-+install_sh
-+STRIP
-+INSTALL_STRIP_PROGRAM
-+mkdir_p
-+AWK
-+SET_MAKE
-+am__leading_dot
-+AMTAR
-+am__tar
-+am__untar
+@@ -823,6 +823,9 @@
+ AMTAR
+ am__tar
+ am__untar
 +MAINTAINER_MODE_TRUE
 +MAINTAINER_MODE_FALSE
 +MAINT
-+KDECONFIG
-+kde_libs_prefix
-+kde_libs_htmldir
-+CONF_FILES
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+ac_ct_CC
-+EXEEXT
-+OBJEXT
-+DEPDIR
-+am__include
-+am__quote
-+AMDEP_TRUE
-+AMDEP_FALSE
-+AMDEPBACKSLASH
-+CCDEPMODE
-+am__fastdepCC_TRUE
-+am__fastdepCC_FALSE
-+CPP
-+CXX
-+CXXFLAGS
-+ac_ct_CXX
-+CXXDEPMODE
-+am__fastdepCXX_TRUE
-+am__fastdepCXX_FALSE
-+WOVERLOADED_VIRTUAL
-+HAVE_GCC_VISIBILITY
-+unsermake_enable_pch_TRUE
-+unsermake_enable_pch_FALSE
-+USE_EXCEPTIONS
-+USE_RTTI
-+CXXCPP
-+NOOPT_CXXFLAGS
-+NOOPT_CFLAGS
-+ENABLE_PERMISSIVE_FLAG
-+LDFLAGS_AS_NEEDED
-+LDFLAGS_NEW_DTAGS
-+KDE_USE_FINAL_TRUE
-+KDE_USE_FINAL_FALSE
-+KDE_USE_CLOSURE_TRUE
-+KDE_USE_CLOSURE_FALSE
-+KDE_NO_UNDEFINED
-+KDE_USE_NMCHECK_TRUE
-+KDE_USE_NMCHECK_FALSE
-+GREP
-+EGREP
-+LN_S
-+ECHO
-+AR
-+RANLIB
-+F77
-+FFLAGS
-+ac_ct_F77
-+LIBTOOL
-+KDE_PLUGIN
-+KDE_CHECK_PLUGIN
-+MSGFMT
-+GMSGFMT
-+XGETTEXT
-+LIBUTIL
-+LIBCOMPAT
-+LIBCRYPT
-+LIBRESOLV
-+LIB_POLL
-+FRAMEWORK_COREAUDIO
-+LIBSOCKET
-+X_EXTRA_LIBS
-+LIBUCB
-+LIBDL
-+KDE_USE_FPIE
-+KDE_USE_PIE
-+include_x11_TRUE
-+include_x11_FALSE
-+XMKMF
-+X_PRE_LIBS
-+LIB_X11
-+LIB_XRENDER
-+LIBSM
-+X_INCLUDES
-+X_LDFLAGS
-+x_includes
-+x_libraries
-+QTE_NORTTI
-+LIB_XEXT
-+LIBPTHREAD
-+USE_THREADS
-+KDE_MT_LDFLAGS
-+KDE_MT_LIBS
-+USER_INCLUDES
-+USER_LDFLAGS
-+LIBZ
-+LIBPNG
-+LIBJPEG
-+qt_libraries
-+qt_includes
-+QT_INCLUDES
-+QT_LDFLAGS
-+PERL
-+MOC
-+UIC
-+UIC_TR
-+LIB_QT
-+LIB_QPE
-+kde_qtver
-+KDE_EXTRA_RPATH
-+KDE_RPATH
-+X_RPATH
-+kde_libraries
-+kde_includes
-+KDE_LDFLAGS
-+KDE_INCLUDES
-+all_includes
-+all_libraries
-+AUTODIRS
-+include_ARTS_TRUE
-+include_ARTS_FALSE
-+MAKEKDEWIDGETS
-+KCONFIG_COMPILER
-+KCFG_DEPENDENCIES
-+DCOPIDLNG
-+DCOPIDL
-+DCOPIDL2CPP
-+DCOP_DEPENDENCIES
-+MCOPIDL
-+ARTSCCONFIG
-+MEINPROC
-+KDE_XSL_STYLESHEET
-+XMLLINT
-+kde_htmldir
-+kde_appsdir
-+kde_icondir
-+kde_sounddir
-+kde_datadir
-+kde_locale
-+kde_confdir
-+kde_kcfgdir
-+kde_mimedir
-+kde_wallpaperdir
-+kde_bindir
-+xdg_appsdir
-+xdg_menudir
-+xdg_directorydir
-+kde_templatesdir
-+kde_servicesdir
-+kde_servicetypesdir
-+kde_moduledir
-+kdeinitdir
-+kde_styledir
-+kde_widgetdir
-+LIB_KDED
-+LIB_KDECORE
-+LIB_KDEUI
-+LIB_KIO
-+LIB_KJS
-+LIB_SMB
-+LIB_KAB
-+LIB_KABC
-+LIB_KHTML
-+LIB_KSPELL
-+LIB_KPARTS
-+LIB_KDEPRINT
-+LIB_KUTILS
-+LIB_KDEPIM
-+LIB_KIMPROXY
-+LIB_KNEWSTUFF
-+LIB_KDNSSD
-+LIB_KUNITTEST
-+LIB_KSYCOCA
-+LIB_KFILE
-+LIB_KFM
-+QTDOCDIR
-+KDE_HAVE_DOT
-+DOXYGEN
-+DOXYGEN_PROJECT_NAME
-+DOXYGEN_PROJECT_NUMBER
-+KDE_HAS_DOXYGEN
-+LIBMAGICK_LIBS
-+LIBMAGICK_LDFLAGS
-+LIBMAGICK_CPPFLAGS
-+LIBMAGICK_RPATH
-+include_imagemagick_filter_TRUE
-+include_imagemagick_filter_FALSE
-+need_kde32_compatibility_TRUE
-+need_kde32_compatibility_FALSE
-+need_kde33_compatibility_TRUE
-+need_kde33_compatibility_FALSE
-+need_kde34_compatibility_TRUE
-+need_kde34_compatibility_FALSE
-+need_kde351_compatibility_TRUE
-+need_kde351_compatibility_FALSE
-+need_kde31_compatibility_TRUE
-+need_kde31_compatibility_FALSE
-+OPENEXR_LIBS
-+OPENEXR_CFLAGS
-+OPENEXR_RPATH
-+have_openexr_TRUE
-+have_openexr_FALSE
-+LIBTIFF
-+have_tiff_TRUE
-+have_tiff_FALSE
-+have_png_TRUE
-+have_png_FALSE
-+have_jpeg_TRUE
-+have_jpeg_FALSE
-+PKG_CONFIG
-+LIBEXIF_CFLAGS
-+LIBEXIF_LIBS
-+have_exif_TRUE
-+have_exif_FALSE
-+include_jpeg_filter_TRUE
-+include_jpeg_filter_FALSE
-+include_tiff_filter_TRUE
-+include_tiff_filter_FALSE
-+LIBWV2_LIBS
-+LIBWV2_CFLAGS
-+LIBWV2_RPATH
-+include_wv2_msword_filter_TRUE
-+include_wv2_msword_filter_FALSE
-+LIBPAPER
-+LIBWPD_LIBS
-+LIBWPD_CFLAGS
-+LIBWPD_RPATH
-+include_wpd_filter_TRUE
-+include_wpd_filter_FALSE
-+LIBXSLT_LIBS
-+LIBXSLT_CFLAGS
-+LIBXSLT_RPATH
-+LIBXML_LIBS
-+LIBXML_CFLAGS
-+LIBXML_RPATH
-+include_XSLTFILTERS_TRUE
-+include_XSLTFILTERS_FALSE
-+LIBFREETYPE_LIBS
-+LIBFREETYPE_CFLAGS
-+LIBFREETYPE_RPATH
-+LIBART_LIBS
-+LIBART_CFLAGS
-+LIBART_RPATH
-+LIBFONTCONFIG_LIBS
-+LIBFONTCONFIG_CFLAGS
-+LIBFONTCONFIG_RPATH
-+have_readline_TRUE
-+have_readline_FALSE
-+LIBREADLINE
-+LIB_KEXI_KMDI
-+LIB_KEXI_KMDI_INCLUDES
-+MYSQL_INC
-+MYSQL_LIBS
-+compile_mysql_plugin_TRUE
-+compile_mysql_plugin_FALSE
-+PG_INCDIR
-+PG_LIBDIR
-+compile_pgsql_plugin_TRUE
-+compile_pgsql_plugin_FALSE
-+PQXX_INCDIR
-+PQXX_LIBDIR
-+LIB_KFEEDBACK
-+INC_KFEEDBACK
-+use_kexifeedback_TRUE
-+use_kexifeedback_FALSE
-+PYTHONINC
-+PYTHONLIB
-+LIBPYTHON
-+PYTHONMODDIR
-+LIB_XINPUTEXT
-+LCMS_LIBS
-+include_kunittest_tests_TRUE
-+include_kunittest_tests_FALSE
-+GLINC
-+GLLIB
-+use_kjsembed_TRUE
-+use_kjsembed_FALSE
-+SQLDIR
-+include_sql_TRUE
-+include_sql_FALSE
-+KWMF_INCLUDES
-+KSTORE_INCLUDES
-+KOTEXT_INCLUDES
-+KOPAINTER_INCLUDES
-+KOPALETTE_INCLUDES
-+KOFFICECORE_INCLUDES
-+KOFFICEUI_INCLUDES
-+KFORMULA_INCLUDES
-+KOPROPERTY_INCLUDES
-+KROSS_INCLUDES
-+LIB_KOFFICEUI
-+LIB_KOFFICECORE
-+LIB_KSTORE
-+LIB_KOTEXT
-+LIB_KOPAINTER
-+LIB_KOPALETTE
-+LIB_KWMF
-+LIB_KOWMF
-+LIB_KFORMULA
-+LIB_KOPROPERTY
-+LIB_KROSS_API
-+LIB_KROSS_MAIN
-+interfacedir
-+KOFFICE_LIBS
-+KOFFICE_INCLUDES
-+LIBKSPELL2
-+compile_kross_TRUE
-+compile_kross_FALSE
-+compile_kross_python_TRUE
-+compile_kross_python_FALSE
-+RUBY
-+RUBY_ARCHDIR
-+RUBY_SITEARCHDIR
-+RUBY_SITEDIR
-+RUBY_INCLUDEDIR
-+RUBY_LIBDIR
-+RUBY_LIBRUBYARG
-+RUBY_ENABLESHARED
-+compile_kross_ruby_TRUE
-+compile_kross_ruby_FALSE
-+TOPSUBDIRS
-+lib_SUBDIR_included_TRUE
-+lib_SUBDIR_included_FALSE
-+interfaces_SUBDIR_included_TRUE
-+interfaces_SUBDIR_included_FALSE
-+autocorrect_SUBDIR_included_TRUE
-+autocorrect_SUBDIR_included_FALSE
-+doc_SUBDIR_included_TRUE
-+doc_SUBDIR_included_FALSE
-+example_SUBDIR_included_TRUE
-+example_SUBDIR_included_FALSE
-+karbon_SUBDIR_included_TRUE
-+karbon_SUBDIR_included_FALSE
-+kchart_SUBDIR_included_TRUE
-+kchart_SUBDIR_included_FALSE
-+kdgantt_SUBDIR_included_TRUE
-+kdgantt_SUBDIR_included_FALSE
-+kformula_SUBDIR_included_TRUE
-+kformula_SUBDIR_included_FALSE
-+kivio_SUBDIR_included_TRUE
-+kivio_SUBDIR_included_FALSE
-+koshell_SUBDIR_included_TRUE
-+koshell_SUBDIR_included_FALSE
-+kounavail_SUBDIR_included_TRUE
-+kounavail_SUBDIR_included_FALSE
-+kpresenter_SUBDIR_included_TRUE
-+kpresenter_SUBDIR_included_FALSE
-+krita_SUBDIR_included_TRUE
-+krita_SUBDIR_included_FALSE
-+kspread_SUBDIR_included_TRUE
-+kspread_SUBDIR_included_FALSE
-+kugar_SUBDIR_included_TRUE
-+kugar_SUBDIR_included_FALSE
-+mimetypes_SUBDIR_included_TRUE
-+mimetypes_SUBDIR_included_FALSE
-+pics_SUBDIR_included_TRUE
-+pics_SUBDIR_included_FALSE
-+plugins_SUBDIR_included_TRUE
-+plugins_SUBDIR_included_FALSE
-+servicetypes_SUBDIR_included_TRUE
-+servicetypes_SUBDIR_included_FALSE
-+templates_SUBDIR_included_TRUE
-+templates_SUBDIR_included_FALSE
-+tools_SUBDIR_included_TRUE
-+tools_SUBDIR_included_FALSE
-+kword_SUBDIR_included_TRUE
-+kword_SUBDIR_included_FALSE
-+kplato_SUBDIR_included_TRUE
-+kplato_SUBDIR_included_FALSE
-+kexi_SUBDIR_included_TRUE
-+kexi_SUBDIR_included_FALSE
-+filters_SUBDIR_included_TRUE
-+filters_SUBDIR_included_FALSE
-+compile_filter_KWORD_TRUE
-+compile_filter_KWORD_FALSE
-+compile_filter_KSPREAD_TRUE
-+compile_filter_KSPREAD_FALSE
-+compile_filter_KCHART_TRUE
-+compile_filter_KCHART_FALSE
-+compile_filter_KARBON_TRUE
-+compile_filter_KARBON_FALSE
-+compile_filter_KPRESENTER_TRUE
-+compile_filter_KPRESENTER_FALSE
-+compile_filter_KFORMULA_TRUE
-+compile_filter_KFORMULA_FALSE
-+compile_filter_KUGAR_TRUE
-+compile_filter_KUGAR_FALSE
-+compile_filter_KRITA_TRUE
-+compile_filter_KRITA_FALSE
-+compile_filter_KIVIO_TRUE
-+compile_filter_KIVIO_FALSE
-+compile_plugin_KUGAR_TRUE
-+compile_plugin_KUGAR_FALSE
-+compile_kexionly_TRUE
-+compile_kexionly_FALSE
-+compile_lib_KOPAINTER_TRUE
-+compile_lib_KOPAINTER_FALSE
-+LIBOBJS
-+LTLIBOBJS'
- ac_subst_files=''
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+CPP
-+CXX
-+CXXFLAGS
-+CCC
-+CXXCPP
-+F77
-+FFLAGS
-+XMKMF'
-+
- 
- # Initialize some variables set by options.
- ac_init_help=
-@@ -492,34 +1265,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
- 
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
-   # If the previous option needs an argument, assign it.
-   if test -n "$ac_prev"; then
--    eval "$ac_prev=\$ac_option"
-+    eval $ac_prev=\$ac_option
-     ac_prev=
-     continue
-   fi
- 
--  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
- 
--  case $ac_option in
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
- 
-   -bindir | --bindir | --bindi | --bind | --bin | --bi)
-     ac_prev=bindir ;;
-@@ -541,12 +1328,18 @@
-   --config-cache | -C)
-     cache_file=config.cache ;;
- 
--  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+  -datadir | --datadir | --datadi | --datad)
-     ac_prev=datadir ;;
--  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
--  | --da=*)
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-     datadir=$ac_optarg ;;
- 
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-   -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-@@ -554,7 +1347,17 @@
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    eval "enable_$ac_feature=no" ;;
-+    eval enable_$ac_feature=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1366,7 @@
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "enable_$ac_feature='$ac_optarg'" ;;
-+    eval enable_$ac_feature=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1393,12 @@
-   -host=* | --host=* | --hos=* | --ho=*)
-     host_alias=$ac_optarg ;;
- 
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-   -includedir | --includedir | --includedi | --included | --include \
-   | --includ | --inclu | --incl | --inc)
-     ac_prev=includedir ;;
-@@ -618,13 +1423,16 @@
-   | --libexe=* | --libex=* | --libe=*)
-     libexecdir=$ac_optarg ;;
- 
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-   -localstatedir | --localstatedir | --localstatedi | --localstated \
--  | --localstate | --localstat | --localsta | --localst \
--  | --locals | --local | --loca | --loc | --lo)
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-     ac_prev=localstatedir ;;
-   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
--  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
--  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-     localstatedir=$ac_optarg ;;
- 
-   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1497,16 @@
-   | --progr-tra=* | --program-tr=* | --program-t=*)
-     program_transform_name=$ac_optarg ;;
- 
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
-@@ -745,11 +1563,7 @@
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package| sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
--    esac
--    eval "with_$ac_package='$ac_optarg'" ;;
-+    eval with_$ac_package=\$ac_optarg ;;
- 
-   -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -758,7 +1572,7 @@
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package | sed 's/-/_/g'`
--    eval "with_$ac_package=no" ;;
-+    eval with_$ac_package=no ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -789,8 +1603,7 @@
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
--    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
--    eval "$ac_envvar='$ac_optarg'"
-+    eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-   *)
-@@ -810,27 +1623,19 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
--  eval ac_val=$`echo $ac_var`
--  case $ac_val in
--    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
--  esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--	      localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
- do
--  eval ac_val=$`echo $ac_var`
-+  eval ac_val=\$$ac_var
-   case $ac_val in
--    [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
-+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+   { (exit 1); exit 1; }; }
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1662,76 @@
- test "$silent" = yes && exec 6>/dev/null
- 
- 
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+  { echo "$as_me: error: Working directory cannot be determined" >&2
-+   { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+   { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
--  # Try the directory containing this script, then its parent.
--  ac_confdir=`(dirname "$0") 2>/dev/null ||
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$0" : 'X\(//\)[^/]' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   srcdir=$ac_confdir
--  if test ! -r $srcdir/$ac_unique_file; then
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-     srcdir=..
-   fi
- else
-   ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
--  if test "$ac_srcdir_defaulted" = yes; then
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
--   { (exit 1); exit 1; }; }
--  else
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
--  fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
--  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
--   { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
--ac_env_CXX_set=${CXX+set}
--ac_env_CXX_value=$CXX
--ac_cv_env_CXX_set=${CXX+set}
--ac_cv_env_CXX_value=$CXX
--ac_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_env_CXXFLAGS_value=$CXXFLAGS
--ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_cv_env_CXXFLAGS_value=$CXXFLAGS
--ac_env_CXXCPP_set=${CXXCPP+set}
--ac_env_CXXCPP_value=$CXXCPP
--ac_cv_env_CXXCPP_set=${CXXCPP+set}
--ac_cv_env_CXXCPP_value=$CXXCPP
--ac_env_F77_set=${F77+set}
--ac_env_F77_value=$F77
--ac_cv_env_F77_set=${F77+set}
--ac_cv_env_F77_value=$F77
--ac_env_FFLAGS_set=${FFLAGS+set}
--ac_env_FFLAGS_value=$FFLAGS
--ac_cv_env_FFLAGS_set=${FFLAGS+set}
--ac_cv_env_FFLAGS_value=$FFLAGS
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+   { (exit 1); exit 1; }; }
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+   { (exit 1); exit 1; }; }
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
- 
- #
- # Report the --help message.
-@@ -973,9 +1760,6 @@
-   -n, --no-create         do not create output files
-       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
- 
--_ACEOF
--
--  cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
- 			  [$ac_default_prefix]
-@@ -993,15 +1777,22 @@
-   --bindir=DIR           user executables [EPREFIX/bin]
-   --sbindir=DIR          system admin executables [EPREFIX/sbin]
-   --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-   --libdir=DIR           object code libraries [EPREFIX/lib]
-   --includedir=DIR       C header files [PREFIX/include]
-   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --infodir=DIR          info documentation [PREFIX/info]
--  --mandir=DIR           man documentation [PREFIX/man]
-+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR          info documentation [DATAROOTDIR/info]
-+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR           man documentation [DATAROOTDIR/man]
-+  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-+  --htmldir=DIR          html documentation [DOCDIR]
-+  --dvidir=DIR           dvi documentation [DOCDIR]
-+  --pdfdir=DIR           pdf documentation [DOCDIR]
-+  --psdir=DIR            ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1025,6 +1816,8 @@
+ KDECONFIG
+ kde_libs_prefix
+ kde_libs_htmldir
+@@ -1833,6 +1836,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -5601,981 +3964,28 @@
    --disable-fast-perl     disable fast Makefile generation (needs perl)
    --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
    --disable-debug         disables debug output and debug symbols default=no
-@@ -1042,10 +1835,8 @@
-                           of memory)
-   --enable-closure        delay template instantiation
-   --enable-nmcheck        enable automatic namespace cleanness check
--  --enable-shared[=PKGS]
--                          build shared libraries [default=yes]
--  --enable-static[=PKGS]
--                          build static libraries [default=no]
-+  --enable-shared[=PKGS]  build shared libraries [default=yes]
-+  --enable-static[=PKGS]  build static libraries [default=no]
-   --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
-   --enable-fast-install[=PKGS]
-                           optimize for fast installation [default=yes]
-@@ -1069,8 +1860,7 @@
-   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
--  --with-tags[=TAGS]
--                          include additional configurations [automatic]
-+  --with-tags[=TAGS]      include additional configurations [automatic]
-   --with-extra-includes=DIR
-                           adds non standard include paths
-   --with-extra-libs=DIR   adds non standard library paths
-@@ -1104,131 +1894,100 @@
-   CFLAGS      C compiler flags
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
--  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
--              headers in a nonstandard directory <include dir>
-+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-   CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-   CXXCPP      C++ preprocessor
-   F77         Fortran 77 compiler command
-   FFLAGS      Fortran 77 compiler flags
-+  XMKMF       Path to xmkmf, Makefile generator for X Window System
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
- 
- _ACEOF
-+ac_status=$?
- fi
- 
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
--  ac_popdir=`pwd`
-   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d $ac_dir || continue
-+    test -d "$ac_dir" || continue
-     ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--    cd $ac_dir
--    # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_srcdir/configure.gnu; then
--      echo
--      $SHELL $ac_srcdir/configure.gnu  --help=recursive
--    elif test -f $ac_srcdir/configure; then
--      echo
--      $SHELL $ac_srcdir/configure  --help=recursive
--    elif test -f $ac_srcdir/configure.ac ||
--	   test -f $ac_srcdir/configure.in; then
--      echo
--      $ac_configure --help
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
--    fi
--    cd "$ac_popdir"
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-   done
- fi
- 
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
+@@ -1985,7 +1990,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.59e
+ configure
+-generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
  
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
--  exit 0
-+  exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@@ -1999,7 +2004,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.59e.  Invocation command line was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.60a.  Invocation command line was
  
    $ $0 $@
  
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1247,7 +2006,7 @@
- /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
- /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
- /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
- /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
- /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1261,6 +2020,7 @@
-   test -z "$as_dir" && as_dir=.
-   echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
+@@ -2969,6 +2974,31 @@
  
- } >&5
  
-@@ -1282,7 +2042,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1293,7 +2052,7 @@
-     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+    *\'*)
-       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-@@ -1315,9 +2074,7 @@
- 	  -* ) ac_must_keep_next=true ;;
- 	esac
-       fi
--      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--      # Get rid of the leading space.
--      ac_sep=" "
-+      ac_configure_args="$ac_configure_args '$ac_arg'"
-       ;;
-     esac
-   done
-@@ -1328,8 +2085,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
-   # Save into config.log some information that might help in debugging.
-   {
-@@ -1342,20 +2099,34 @@
- _ASBOX
-     echo
-     # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-   (set) 2>&1 |
--    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       sed -n \
--	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
--      ;;
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-     *)
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--}
-+    esac |
-+    sort
-+)
-     echo
  
-     cat <<\_ASBOX
-@@ -1366,22 +2137,28 @@
-     echo
-     for ac_var in $ac_subst_vars
-     do
--      eval ac_val=$`echo $ac_var`
--      echo "$ac_var='"'"'$ac_val'"'"'"
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-     if test -n "$ac_subst_files"; then
-       cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
-       echo
-       for ac_var in $ac_subst_files
-       do
--	eval ac_val=$`echo $ac_var`
--	echo "$ac_var='"'"'$ac_val'"'"'"
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1393,26 +2170,24 @@
- ## ----------- ##
- _ASBOX
-       echo
--      sed "/^$/d" confdefs.h | sort
-+      cat confdefs.h
-       echo
-     fi
-     test "$ac_signal" != 0 &&
-       echo "$as_me: caught signal $ac_signal"
-     echo "$as_me: exit $exit_status"
-   } >&5
--  rm -f core *.core &&
--  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-     exit $exit_status
--     ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
-   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
- 
- # Predefined preprocessor variables.
- 
-@@ -1443,14 +2218,17 @@
- 
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--  fi
-+if test -n "$CONFIG_SITE"; then
-+  set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+  set x "$ac_default_prefix/share/config.site" \
-+	"$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
-   if test -r "$ac_site_file"; then
-     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1466,8 +2244,8 @@
-     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
--      [\\/]* | ?:[\\/]* ) . $cache_file;;
--      *)                      . ./$cache_file;;
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
-     esac
-   fi
- else
-@@ -1479,12 +2257,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
--	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
-   eval ac_old_set=\$ac_cv_env_${ac_var}_set
-   eval ac_new_set=\$ac_env_${ac_var}_set
--  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
--  eval ac_new_val="\$ac_env_${ac_var}_value"
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
-       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1509,8 +2286,7 @@
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
-     esac
-     case " $ac_configure_args " in
-@@ -1527,12 +2303,6 @@
-    { (exit 1); exit 1; }; }
- fi
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
- 
- 
- 
-@@ -1549,110 +2319,165 @@
- 
- 
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- ac_aux_dir=
--for ac_dir in admin $srcdir/admin; do
--  if test -f $ac_dir/install-sh; then
-+for ac_dir in admin "$srcdir"/admin; do
-+  if test -f "$ac_dir/install-sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install-sh -c"
-     break
--  elif test -f $ac_dir/install.sh; then
-+  elif test -f "$ac_dir/install.sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install.sh -c"
-     break
--  elif test -f $ac_dir/shtool; then
-+  elif test -f "$ac_dir/shtool"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/shtool install -c"
-     break
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;}
-+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
- 
- 
- unset CDPATH
- 
- # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
--  ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
-   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- 
- 
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
--  ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
-+fi
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
- 
--echo "$as_me:$LINENO: checking target system type" >&5
--echo $ECHO_N "checking target system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking target system type" >&5
-+echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_target_alias=$target_alias
--test "x$ac_cv_target_alias" = "x" &&
--  ac_cv_target_alias=$ac_cv_host_alias
--ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-+  if test "x$target_alias" = x; then
-+  ac_cv_target=$ac_cv_host
-+else
-+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
-+fi
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_target" >&5
--echo "${ECHO_T}$ac_cv_target" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-+echo "${ECHO_T}$ac_cv_target" >&6; }
-+case $ac_cv_target in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-+echo "$as_me: error: invalid value of canonical target" >&2;}
-+   { (exit 1); exit 1; }; };;
-+esac
- target=$ac_cv_target
--target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_target
-+shift
-+target_cpu=$1
-+target_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+target_os=$*
-+IFS=$ac_save_IFS
-+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
- 
- 
- # The aliases save the names the user supplied, while $host etc.
-@@ -1662,17 +2487,17 @@
-     NONENONEs,x,x, &&
-   program_prefix=${target_alias}-
- test "$program_prefix" != NONE &&
--  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
--  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
- # Double any \ or $.  echo might interpret backslashes.
- # By default was `s,x,x', remove it if useless.
- cat <<\_ACEOF >conftest.sed
- s/[\\$]/&&/g;s/;s,x,x,$//
- _ACEOF
- program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
-+rm -f conftest.sed
- 
- 
- am__api_version="1.9"
-@@ -1694,8 +2519,8 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1717,7 +2542,7 @@
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
- 	  if test $ac_prog = install &&
- 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
-@@ -1736,21 +2561,22 @@
-     ;;
- esac
- done
-+IFS=$as_save_IFS
- 
- 
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
--    # As a last resort, use the slow shell script.  We don't cache a
--    # path for INSTALL within a source directory, because that will
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
--    # removed, or if the path is relative.
-+    # removed, or if the value is a relative name.
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1764,8 +2590,8 @@
-   if test -z "$kde_save_INSTALL_given" ; then
-     # OK, user hasn't given any INSTALL, autoconf found one for us
-     # now we test, if it supports the -p flag
--    echo "$as_me:$LINENO: checking for -p flag to install" >&5
--echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for -p flag to install" >&5
-+echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; }
-     rm -f confinst.$$.* > /dev/null 2>&1
-     echo "Testtest" > confinst.$$.orig
-     ac_res=no
-@@ -1777,8 +2603,8 @@
-       fi
-     fi
-     rm -f confinst.$$.*
--    echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6
-+    { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-   fi
- 
-   if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1788,8 +2614,8 @@
-     INSTALL_SCRIPT='${INSTALL}'
-   fi
- 
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -1831,8 +2657,8 @@
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
- 
-@@ -1883,8 +2709,8 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1897,54 +2723,57 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AWK="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+  { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$AWK" && break
- done
- 
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
--	@echo 'ac_maketemp="$(MAKE)"'
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
--  eval ac_cv_prog_make_${ac_make}_set=yes
--else
--  eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
- rm -f conftest.make
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   SET_MAKE=
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -2015,8 +2844,8 @@
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2029,32 +2858,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2067,27 +2898,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  STRIP=$ac_ct_STRIP
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -2107,6 +2952,31 @@
- 
- 
- 
 +{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 +echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
 +    # Check whether --enable-maintainer-mode was given.
@@ -6604,4620 +4014,268 @@
  
    unset CDPATH
  
-@@ -2125,14 +2995,14 @@
- 
-   if test "x$prefix" = "xNONE"; then
- 
--   echo "$as_me:$LINENO: checking for kde-config" >&5
--echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for kde-config" >&5
-+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
-    if test -n "$KDECONFIG"; then
-         kde_cv_path="$KDECONFIG";
-    else
-         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -2175,8 +3045,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
- Please check whether you installed KDE correctly.
-@@ -2187,8 +3057,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       KDECONFIG=$kde_cv_path
- 
-    fi
-@@ -2197,14 +3067,14 @@
-         kde_save_PATH="$PATH"
-     PATH="$exec_prefix/bin:$prefix/bin:$PATH"
- 
--   echo "$as_me:$LINENO: checking for kde-config" >&5
--echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for kde-config" >&5
-+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; }
-    if test -n "$KDECONFIG"; then
-         kde_cv_path="$KDECONFIG";
-    else
-         kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -2247,8 +3117,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
- Please check whether you installed KDE correctly.
-@@ -2259,8 +3129,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       KDECONFIG=$kde_cv_path
- 
-    fi
-@@ -2283,16 +3153,16 @@
-   kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-   kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
- 
--  echo "$as_me:$LINENO: checking where to install" >&5
--echo $ECHO_N "checking where to install... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking where to install" >&5
-+echo $ECHO_N "checking where to install... $ECHO_C" >&6; }
-   if test "x$prefix" = "xNONE"; then
-     prefix=$kde_libs_prefix
--    echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
--echo "${ECHO_T}$prefix (as returned by kde-config)" >&6
-+    { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5
-+echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; }
-   else
-         given_prefix=$prefix
--    echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
--echo "${ECHO_T}$prefix (as requested)" >&6
-+    { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5
-+echo "${ECHO_T}$prefix (as requested)" >&6; }
-   fi
- 
-   # And delete superfluous '/' to make compares easier
-@@ -2305,13 +3175,13 @@
- 
- 
- 
--    # Check whether --enable-fast-perl or --disable-fast-perl was given.
-+    # Check whether --enable-fast-perl was given.
- if test "${enable_fast_perl+set}" = set; then
--  enableval="$enable_fast_perl"
--  with_fast_perl=$enableval
-+  enableval=$enable_fast_perl; with_fast_perl=$enableval
- else
-   with_fast_perl=yes
--fi;
-+fi
-+
- 
- 
-   val=
-@@ -2328,11 +3198,11 @@
- 
- 
- 
--          ac_config_headers="$ac_config_headers config.h"
-+ac_config_headers="$ac_config_headers config.h"
- 
- DEPDIR="${am__leading_dot}deps"
- 
--          ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
- 
- 
- am_make=${MAKE-make}
-@@ -2342,8 +3212,8 @@
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -2370,15 +3240,15 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
- rm -f confinc confmf
- 
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-+# Check whether --enable-dependency-tracking was given.
- if test "${enable_dependency_tracking+set}" = set; then
--  enableval="$enable_dependency_tracking"
-+  enableval=$enable_dependency_tracking;
-+fi
- 
--fi;
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
-@@ -2398,10 +3268,9 @@
- 
- 
- 
--  # Check whether --enable-debug or --disable-debug was given.
-+  # Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
--  enableval="$enable_debug"
--
-+  enableval=$enable_debug;
-     case $enableval in
-       yes)
-         kde_use_debug_code="yes"
-@@ -2421,18 +3290,18 @@
-   kde_use_debug_code="no"
-       kde_use_debug_define=no
- 
--fi;
-+fi
-+
- 
--    # Check whether --enable-dummyoption or --disable-dummyoption was given.
-+    # Check whether --enable-dummyoption was given.
- if test "${enable_dummyoption+set}" = set; then
--  enableval="$enable_dummyoption"
-+  enableval=$enable_dummyoption;
-+fi
- 
--fi;
- 
--  # Check whether --enable-strict or --disable-strict was given.
-+  # Check whether --enable-strict was given.
- if test "${enable_strict+set}" = set; then
--  enableval="$enable_strict"
--
-+  enableval=$enable_strict;
-     if test $enableval = "no"; then
-          kde_use_strict_options="no"
-        else
-@@ -2441,12 +3310,12 @@
- 
- else
-   kde_use_strict_options="no"
--fi;
-+fi
- 
--  # Check whether --enable-warnings or --disable-warnings was given.
--if test "${enable_warnings+set}" = set; then
--  enableval="$enable_warnings"
- 
-+  # Check whether --enable-warnings was given.
-+if test "${enable_warnings+set}" = set; then
-+  enableval=$enable_warnings;
-     if test $enableval = "no"; then
-          kde_use_warnings="no"
-        else
-@@ -2455,20 +3324,21 @@
- 
- else
-   kde_use_warnings="yes"
--fi;
-+fi
-+
- 
-     if test "$kde_use_debug_code" != "no"; then
-     kde_use_warnings=yes
-   fi
- 
--  # Check whether --enable-profile or --disable-profile was given.
-+  # Check whether --enable-profile was given.
- if test "${enable_profile+set}" = set; then
--  enableval="$enable_profile"
--  kde_use_profiling=$enableval
-+  enableval=$enable_profile; kde_use_profiling=$enableval
- else
-   kde_use_profiling="no"
- 
--fi;
-+fi
-+
- 
-     CFLAGS=" $CFLAGS"
- 
-@@ -2480,8 +3350,8 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2494,32 +3364,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2532,36 +3404,51 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
- else
-   CC="$ac_cv_prog_CC"
- fi
- 
- if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2574,74 +3461,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  CC=$ac_ct_CC
--else
--  CC="$ac_cv_prog_CC"
--fi
- 
-+  fi
- fi
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2655,7 +3502,7 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-@@ -2666,6 +3513,7 @@
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- if test $ac_prog_rejected = yes; then
-   # We found a bogon in the path, so make sure we never use it.
-@@ -2683,22 +3531,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$CC"; then
-   if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl
-+  for ac_prog in cl.exe
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2711,36 +3560,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+  { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$CC" && break
-   done
- fi
- if test -z "$CC"; then
-   ac_ct_CC=$CC
--  for ac_prog in cl
-+  for ac_prog in cl.exe
+@@ -3736,7 +3766,7 @@
+ # in a Makefile.  We should not override ac_cv_exeext if it was cached,
+ # so that the user can short-circuit this test for compilers unknown to
+ # Autoconf.
+-for ac_file in $ac_files
++for ac_file in $ac_files ''
  do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2753,29 +3604,45 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_CC" && break
- done
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CC=$ac_ct_CC
-+  fi
- fi
- 
- fi
-@@ -2788,21 +3655,35 @@
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -2827,46 +3708,70 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
--  (eval $ac_link_default) 2>&5
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort.  b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions.  Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link_default") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  # Find the output, starting from the most likely.  This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files
- do
    test -f "$ac_file" || continue
    case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
--	;;
--    conftest.$ac_ext )
--	# This is the source file.
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
- 	# certainly right.
- 	break;;
-     *.* )
--	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	# FIXME: I believe we export ac_cv_exeext for Libtool,
--	# but it would be cool to find out if it's true.  Does anybody
--	# maintain Libtool? --akim.
--	export ac_cv_exeext
-+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
- 	break;;
-     * )
- 	break;;
-   esac
- done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2879,19 +3784,23 @@
- fi
+@@ -3764,6 +3794,12 @@
+ test "$ac_cv_exeext" = no && ac_cv_exeext=
  
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
- 
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -2910,22 +3819,27 @@
-     fi
-   fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run.  If not, either
-+# Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
--
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-@@ -2936,9 +3850,8 @@
- for ac_file in conftest.exe conftest conftest.*; do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	  export ac_cv_exeext
- 	  break;;
-     * ) break;;
-   esac
-@@ -2952,14 +3865,14 @@
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2979,14 +3892,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+  for ac_file in conftest.o conftest.obj conftest.*; do
-+  test -f "$ac_file" || continue;
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
-@@ -3004,12 +3923,12 @@
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3032,23 +3951,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3057,24 +3989,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
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3090,23 +4026,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3115,281 +4064,273 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_cc_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
--   function prototypes and stuff, but not '\xHH' hex character constants.
--   These don't provoke an error unfortunately, instead are silently treated
--   as 'x'.  The following induces an error, until -std1 is added to get
--   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
--   array size at least.  It's necessary to write '\x00'==0 to get something
--   that's true only with -std1.  */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
- 
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
- int
- main ()
- {
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+
-   ;
-   return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX 10.20 and later	-Ae
--# HP-UX older versions	-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_prog_cc_stdc=$ac_arg
--break
-+  :
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
--rm -f conftest.err conftest.$ac_objext
--done
--rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
--
--fi
--
--case "x$ac_cv_prog_cc_stdc" in
--  x|xno)
--    echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
--  *)
--    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
--    CC="$CC $ac_cv_prog_cc_stdc" ;;
--esac
--
--# Some people use a C++ compiler to compile C.  Since we use `exit',
--# in C++ we need to declare it.  In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
--  choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  :
-+  ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--continue
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
++  ac_file=''
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
- int
- main ()
- {
--exit (42);
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  break
-+  ac_cv_prog_cc_c89=$ac_arg
- else
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-+
+@@ -3775,8 +3811,6 @@
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
- fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
  
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+ ac_exeext=$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
  
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3398,8 +4339,8 @@
+ # Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+@@ -5464,7 +5498,7 @@
  
- depcc="$CC"   am_compiler_list=
- 
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3488,8 +4429,8 @@
  fi
  
- fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
- 
-@@ -3511,8 +4452,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -3546,8 +4487,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -3572,9 +4518,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3584,8 +4531,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -3612,6 +4564,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -3629,8 +4582,8 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -3653,8 +4606,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -3679,9 +4637,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3691,8 +4650,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -3719,6 +4683,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -3769,18 +4734,22 @@
- 
-   CXXFLAGS=" $CXXFLAGS"
- 
--  ac_ext=cc
-+  ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3793,36 +4762,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6
-+  { echo "$as_me:$LINENO: result: $CXX" >&5
-+echo "${ECHO_T}$CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-     test -n "$CXX" && break
-   done
- fi
- if test -z "$CXX"; then
-   ac_ct_CXX=$CXX
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3835,55 +4806,85 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CXX="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+echo "${ECHO_T}$ac_ct_CXX" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   test -n "$ac_ct_CXX" && break
- done
--test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- 
--  CXX=$ac_ct_CXX
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    CXX=$ac_ct_CXX
-+  fi
- fi
- 
--
-+  fi
-+fi
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C++ compiler version" >&5
-+echo "$as_me:$LINENO: checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3906,23 +4907,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3931,24 +4945,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
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
- GXX=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--CXXFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
-+   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -3964,23 +4982,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3989,69 +5020,53 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_cxx_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
--fi
--for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
-+	CXXFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4060,60 +5075,91 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
-+	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
-+
- int
- main ()
- {
--exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  break
-+  ac_cv_prog_cxx_g=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
- fi
- 
-+rm -f 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
-+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
-+fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4122,8 +5168,8 @@
- 
- depcc="$CXX"  am_compiler_list=
- 
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -4212,8 +5258,8 @@
- fi
- 
- fi
--echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
- 
-@@ -4231,8 +5277,8 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
--echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5
-+echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; }
- 
- 
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -4257,23 +5303,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4282,13 +5341,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_bad_compiler=yes
-+	kde_bad_compiler=yes
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--  echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5
--echo "${ECHO_T}$kde_bad_compiler" >&6
-+  { 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:
-@@ -4330,17 +5390,16 @@
-         fi
-       fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; }
- kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
- 
--
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4368,23 +5427,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4393,7 +5465,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4407,29 +5481,28 @@
- fi
+   ac_ext=c
+@@ -5566,7 +5600,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="-fno-builtin $CXXFLAGS"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
--echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
-+echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; }
- kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4456,23 +5529,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4481,7 +5567,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4495,13 +5583,13 @@
- fi
+   ac_ext=c
+@@ -5682,7 +5716,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
-  WOVERLOADED_VRITUAL=""
  fi
-@@ -4522,16 +5610,15 @@
  
-   if test "$kde_use_profiling" = "yes"; then
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
--echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
-+echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; }
- kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4558,23 +5645,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4583,7 +5683,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4597,16 +5699,16 @@
- fi
+   ac_ext=c
+@@ -5795,7 +5829,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
- 
-       CFLAGS="-pg $CFLAGS"
-       CXXFLAGS="-pg $CXXFLAGS"
- 
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
-@@ -4621,16 +5723,15 @@
-             CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
  
--echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
--echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; }
- kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4657,23 +5758,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4682,7 +5796,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4696,27 +5812,26 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
--echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5
-+echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; }
- kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
    ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4741,23 +5856,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4766,7 +5894,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -5893,7 +5927,7 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
-@@ -4780,13 +5910,13 @@
- fi
+   ac_ext=c
+@@ -5996,7 +6030,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
-@@ -4794,16 +5924,15 @@
-           ;;
-         esac
  
--echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
--echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; }
- kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4830,23 +5959,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4855,7 +5997,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4869,28 +6013,27 @@
- fi
+   ac_ext=c
+@@ -6097,7 +6131,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="-Wundef $CXXFLAGS"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
--echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; }
- kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4917,23 +6060,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4942,7 +6098,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4956,28 +6114,27 @@
- fi
+   ac_ext=c
+@@ -6198,7 +6232,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="-Wno-long-long $CXXFLAGS"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
--echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; }
- kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5004,23 +6161,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5029,7 +6199,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5043,13 +6215,13 @@
- fi
+   ac_ext=c
+@@ -6319,7 +6353,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
-@@ -5061,13 +6233,13 @@
-     CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-   fi
  
--  # Check whether --enable-pch or --disable-pch was given.
-+  # Check whether --enable-pch was given.
- if test "${enable_pch+set}" = set; then
--  enableval="$enable_pch"
--   kde_use_pch=$enableval
-+  enableval=$enable_pch;  kde_use_pch=$enableval
- else
-    kde_use_pch=no
--fi;
-+fi
-+
- 
-   HAVE_GCC_VISIBILITY=0
- 
-@@ -5075,16 +6247,15 @@
-   if test "$GXX" = "yes"; then
-     gcc_no_reorder_blocks=NO
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; }
- kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5111,23 +6282,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5136,7 +6320,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5150,13 +6336,13 @@
- fi
+   ac_ext=c
+@@ -6426,7 +6460,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  gcc_no_reorder_blocks=YES
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
-@@ -5168,16 +6354,15 @@
-           CFLAGS="$CFLAGS -fno-reorder-blocks"
-     fi
  
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; }
- kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5204,23 +6389,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5229,7 +6427,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5243,28 +6443,27 @@
- fi
+   ac_ext=c
+@@ -6527,7 +6561,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -fno-exceptions"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; }
- kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5291,23 +6490,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5316,7 +6528,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5330,28 +6544,27 @@
- fi
+   ac_ext=c
+@@ -6628,7 +6662,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -fno-check-new"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
--echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
-+echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; }
- kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5378,23 +6591,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5403,7 +6629,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5417,28 +6645,27 @@
- fi
+   ac_ext=c
+@@ -6729,7 +6763,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS -fno-common"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
--echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
-+echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; }
- kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5465,23 +6692,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5490,7 +6730,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5504,13 +6746,13 @@
- fi
+   ac_ext=c
+@@ -6860,7 +6894,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  USE_EXCEPTIONS="-fexceptions"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
-  USE_EXCEPTIONS=
  fi
-@@ -5518,37 +6760,37 @@
-     ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
-     if test "$kde_use_pch" = "yes"; then
--        echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
--echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5
-+echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; }
-         echo >conftest.h
-         if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then
-             kde_gcc_supports_pch=yes
--            echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+            { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         else
-             kde_gcc_supports_pch=no
--            echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+            { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-         fi
-         if test "$kde_gcc_supports_pch" = "yes"; then
--            echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
--echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5
-+echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; }
-             if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then
-                 kde_gcc_supports_pch=yes
--                echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+                { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-             else
-                 kde_gcc_supports_pch=no
--                echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+                { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-             fi
-         fi
-         rm -f conftest.h conftest.h.gch
-     fi
- 
- 
--  echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
--echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5
-+echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; }
- if test "${kde_cv_opt_noinline_match+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -5580,23 +6822,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5605,9 +6860,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_opt_noinline_match=no
-+	kde_cv_opt_noinline_match=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -5615,8 +6871,8 @@
-   fi
+     CFLAGS="$ac_cflags_save"
+@@ -6964,7 +6998,7 @@
  
  fi
--echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
--echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
-+echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
  
-     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
-        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5636,16 +6892,15 @@
- 
-     if test "$kde_use_pch" = "yes"; then
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
--echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
-+echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; }
- kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5672,23 +6927,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5697,7 +6965,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5711,29 +6981,28 @@
- fi
+   ac_ext=c
+@@ -7066,7 +7100,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --pch"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
-                                               fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; }
- kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5760,23 +7029,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5785,7 +7067,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5799,28 +7083,27 @@
- fi
+   ac_ext=c
+@@ -7167,7 +7201,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; }
- kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5847,23 +7130,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5872,7 +7168,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5886,28 +7184,27 @@
- fi
+   ac_ext=c
+@@ -7268,7 +7302,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; }
- kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5934,23 +7231,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5959,7 +7269,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5973,28 +7285,27 @@
- fi
+   ac_ext=c
+@@ -7369,7 +7403,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
--echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
-+echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; }
- kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6021,23 +7332,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6046,7 +7370,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6060,28 +7386,27 @@
- fi
+   ac_ext=c
+@@ -7470,7 +7504,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
--echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
-+echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; }
- kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6108,23 +7433,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6133,7 +7471,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6147,13 +7487,13 @@
- fi
+   ac_ext=c
+@@ -7931,7 +7965,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  CXXFLAGS="$CXXFLAGS --one_per"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
-@@ -6260,13 +7600,13 @@
- fi
  
- 
--  ac_ext=cc
-+  ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6296,8 +7636,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -6322,9 +7667,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6334,8 +7680,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -6362,6 +7713,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -6379,8 +7731,8 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6
-+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+echo "${ECHO_T}$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -6403,8 +7755,13 @@
- #endif
- 		     Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -6429,9 +7786,10 @@
-   # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6441,8 +7799,13 @@
- /* end confdefs.h.  */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -6469,6 +7832,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- 
- done
-@@ -6495,16 +7859,15 @@
-      NOOPT_CFLAGS=-O0
-   fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
--echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
-+echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; }
- kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6531,23 +7894,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6556,7 +7932,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6570,22 +7948,21 @@
- fi
+   ac_ext=c
+@@ -8071,7 +8105,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  NOOPT_CXXFLAGS=-O0
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
--  # Check whether --enable-coverage or --disable-coverage was given.
-+  # Check whether --enable-coverage was given.
- if test "${enable_coverage+set}" = set; then
--  enableval="$enable_coverage"
--
-+  enableval=$enable_coverage;
-       if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
-         ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
-         ac_coverage_linker="-lgcc"
-@@ -6601,36 +7978,36 @@
-       CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
-       LDFLAGS="$LDFLAGS $ac_coverage_linker"
- 
--fi;
-+fi
-+
- 
- 
- 
- 
- 
- 
--  # Check whether --enable-new_ldflags or --disable-new_ldflags was given.
-+  # Check whether --enable-new_ldflags was given.
- if test "${enable_new_ldflags+set}" = set; then
--  enableval="$enable_new_ldflags"
--  kde_use_new_ldflags=$enableval
-+  enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval
- else
-   kde_use_new_ldflags=no
--fi;
-+fi
-+
- 
-   LDFLAGS_AS_NEEDED=""
-   LDFLAGS_NEW_DTAGS=""
-   if test "x$kde_use_new_ldflags" = "xyes"; then
-        LDFLAGS_NEW_DTAGS=""
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; }
- kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6657,23 +8034,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6682,7 +8072,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6696,29 +8088,28 @@
- fi
+   ac_ext=c
+@@ -8173,7 +8207,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
  
- 
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5
-+echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; }
- kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6745,23 +8136,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6770,7 +8174,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6784,13 +8190,13 @@
- fi
- 
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  LDFLAGS_AS_NEEDED="-Wl,--as-needed"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -6800,13 +8206,13 @@
- 
- 
- 
--  # Check whether --enable-final or --disable-final was given.
-+  # Check whether --enable-final was given.
- if test "${enable_final+set}" = set; then
--  enableval="$enable_final"
--  kde_use_final=$enableval
-+  enableval=$enable_final; kde_use_final=$enableval
- else
-   kde_use_final=no
--fi;
-+fi
-+
- 
-   if test "x$kde_use_final" = "xyes"; then
-       KDE_USE_FINAL_TRUE=""
-@@ -6819,13 +8225,13 @@
- 
- 
- 
--  # Check whether --enable-closure or --disable-closure was given.
-+  # Check whether --enable-closure was given.
- if test "${enable_closure+set}" = set; then
--  enableval="$enable_closure"
--  kde_use_closure=$enableval
-+  enableval=$enable_closure; kde_use_closure=$enableval
- else
-   kde_use_closure=no
--fi;
-+fi
-+
- 
-   KDE_NO_UNDEFINED=""
-   if test "x$kde_use_closure" = "xyes"; then
-@@ -6836,214 +8242,36 @@
+   ac_ext=c
+@@ -8238,211 +8272,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
 -       case $host in
 -         *-*-linux-gnu)
-+  fi
- 
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
+-
+-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; }
 -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+  # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
-+  kde_use_nmcheck=no
-+fi
- 
- 
-+  if test "$kde_use_nmcheck" = "yes"; then
-+      KDE_USE_NMCHECK_TRUE=""
-+      KDE_USE_NMCHECK_FALSE="#"
-+   else
-+      KDE_USE_NMCHECK_TRUE="#"
-+      KDE_USE_NMCHECK_FALSE=""
-+  fi
- 
--   ac_ext=cc
+-else
+-
+-
+-   ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
+-
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- 
- 
+-
+-
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -11236,23 +4294,36 @@
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -11261,8 +4332,10 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  CXXFLAGS="$save_CXXFLAGS"
 -  ac_ext=c
@@ -11275,20 +4348,19 @@
 -fi
 -
 -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 - :
 -
--echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
--echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
+-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; }
 -kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
+-if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -
 -
--
--   ac_ext=cc
+-   ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -11315,23 +4387,36 @@
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -11340,8 +4425,10 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -  CXXFLAGS="$save_CXXFLAGS"
 -  ac_ext=c
@@ -11354,151 +4441,30 @@
 -fi
 -
 -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+- { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 - :
 - KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
 -else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 - :
 - KDE_NO_UNDEFINED=""
 -fi
 -
 -else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 - :
 - KDE_NO_UNDEFINED=""
 -fi
 -
 -           ;;
 -       esac
--  fi
--
--
--
--
--
--  # Check whether --enable-nmcheck or --disable-nmcheck was given.
--if test "${enable_nmcheck+set}" = set; then
--  enableval="$enable_nmcheck"
--  kde_use_nmcheck=$enableval
--else
--  kde_use_nmcheck=no
--fi;
--
--  if test "$kde_use_nmcheck" = "yes"; then
--      KDE_USE_NMCHECK_TRUE=""
--      KDE_USE_NMCHECK_FALSE="#"
--   else
--      KDE_USE_NMCHECK_TRUE="#"
--      KDE_USE_NMCHECK_FALSE=""
--  fi
+   fi
  
  
--
--
--
--
--# Check whether --enable-shared or --disable-shared was given.
-+# Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
--  enableval="$enable_shared"
--  p=${PACKAGE-default}
-+  enableval=$enable_shared; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_shared=yes ;;
-     no) enable_shared=no ;;
-@@ -7062,12 +8290,12 @@
-     esac
- else
-   enable_shared=yes
--fi;
-+fi
-+
- 
--# Check whether --enable-static or --disable-static was given.
-+# Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
--  enableval="$enable_static"
--  p=${PACKAGE-default}
-+  enableval=$enable_static; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_static=yes ;;
-     no) enable_static=no ;;
-@@ -7086,7 +8314,8 @@
-     esac
- else
-   enable_static=no
--fi;
-+fi
-+
- 
- 
- 
-@@ -7095,11 +8324,11 @@
-     if test -z "$kdelibsuff"; then
-        kdelibsuff="no"
-     fi
--    # Check whether --enable-libsuffix or --disable-libsuffix was given.
-+    # Check whether --enable-libsuffix was given.
- if test "${enable_libsuffix+set}" = set; then
--  enableval="$enable_libsuffix"
--  kdelibsuff=$enableval
--fi;
-+  enableval=$enable_libsuffix; kdelibsuff=$enableval
-+fi
-+
- 
-     if test "$kdelibsuff" = "auto"; then
- 
-@@ -7120,8 +8349,8 @@
-        kdelibsuff=
-     fi
-     if test -z "$kdelibsuff"; then
--        echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
--echo "${ECHO_T}not using lib directory suffix" >&6
-+        { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
-+echo "${ECHO_T}not using lib directory suffix" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define KDELIBSUFF ""
-@@ -7137,14 +8366,13 @@
- #define KDELIBSUFF "${kdelibsuff}"
- _ACEOF
- 
--        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
--echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
-+        { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
-+echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; }
-     fi
- 
--# Check whether --enable-fast-install or --disable-fast-install was given.
-+# Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
--  enableval="$enable_fast_install"
--  p=${PACKAGE-default}
-+  enableval=$enable_fast_install; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_fast_install=yes ;;
-     no) enable_fast_install=no ;;
-@@ -7163,10 +8391,11 @@
-     esac
- else
-   enable_fast_install=yes
--fi;
-+fi
-+
- 
--echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
- if test "${lt_cv_path_SED+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7190,7 +8419,7 @@
+@@ -8618,7 +8447,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
@@ -11507,225 +4473,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7219,37 +8448,184 @@
- fi
- 
- SED=$lt_cv_path_SED
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
-+{ echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in grep ggrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+    # Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'GREP' >> "conftest.nl"
-+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_GREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+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
-+
-+else
-+  ac_cv_path_GREP=$GREP
-+fi
-+
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
-+  ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_prog in egrep; do
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+    # Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    echo 'EGREP' >> "conftest.nl"
-+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+    ac_count=`expr $ac_count + 1`
-+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_EGREP="$ac_path_EGREP"
-+      ac_path_EGREP_max=$ac_count
-     fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+    $ac_path_EGREP_found && break 3
-+  done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+  { { 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
-+
-+else
-+  ac_cv_path_EGREP=$EGREP
- 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
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
- 
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -7278,11 +8654,11 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7295,7 +8671,7 @@
+@@ -8870,7 +8699,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,
@@ -11734,27 +4482,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'*)
-@@ -7315,21 +8691,21 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+@@ -8904,7 +8733,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -11763,33 +4491,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7339,29 +8715,38 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
--echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
+@@ -8934,6 +8763,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -11803,14 +4505,9 @@
 +    ;;
 +esac
  
--echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7369,56 +8754,63 @@
+ { echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+@@ -8944,36 +8782,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -11878,37 +4575,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
- 
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7445,44 +8837,36 @@
+@@ -9020,44 +8865,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -11963,7 +4630,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7498,7 +8882,7 @@
+@@ -9073,7 +8910,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -11972,7 +4639,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
-@@ -7514,43 +8898,27 @@
+@@ -9089,43 +8926,27 @@
    esac
    ;;
  
@@ -12028,7 +4695,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
-@@ -7569,32 +8937,22 @@
+@@ -9144,32 +8965,22 @@
    ;;
  
  openbsd*)
@@ -12064,7 +4731,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]'
-@@ -7615,17 +8973,20 @@
+@@ -9190,10 +9001,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -12079,16 +4746,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7634,14 +8995,17 @@
+@@ -9209,6 +9023,9 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -12098,27 +4756,16 @@
  # Allow CC to be a program name with arguments.
  compiler=$CC
  
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
- 
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- # Some flags need to be propagated to the compiler or linker for good
-@@ -7668,7 +9032,7 @@
+@@ -9243,7 +9060,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7671 "configure"' > conftest.$ac_ext
-+  echo '#line 9035 "configure"' > conftest.$ac_ext
+-  echo '#line 9246 "configure"' > conftest.$ac_ext
++  echo '#line 9063 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7711,14 +9075,13 @@
+@@ -9286,14 +9103,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -12135,7 +4782,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7730,7 +9093,6 @@
+@@ -9305,7 +9121,6 @@
        esac
        ;;
      *64-bit*)
@@ -12143,82 +4790,16 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7755,8 +9117,8 @@
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
--  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7782,23 +9144,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7807,8 +9182,9 @@
-   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
+@@ -9398,7 +9213,7 @@
+ 	lt_cv_cc_needs_belf=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
-@@ -7818,13 +9194,33 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -9414,6 +9229,26 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -12245,365 +4826,8 @@
  
  esac
  
-@@ -7832,8 +9228,8 @@
+@@ -9862,217 +9697,478 @@
  
- 
- 
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7857,23 +9253,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7882,8 +9291,9 @@
-   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
- 
- if test $ac_cv_header_stdc = yes; then
-@@ -7940,6 +9350,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7959,18 +9370,27 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7983,12 +9403,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -8011,9 +9433,9 @@
- 		  inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -8027,23 +9449,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8052,12 +9487,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
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8072,18 +9509,19 @@
- for ac_header in dlfcn.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8094,23 +9532,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8119,15 +9570,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -8136,8 +9588,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -8161,9 +9618,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8187,25 +9645,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8217,217 +9669,538 @@
- 
  done
  
 -ac_ext=f
@@ -12611,12 +4835,12 @@
 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 -if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
 -  do
 -    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_F77+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -12629,36 +4853,38 @@
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
 -done
- 
+-IFS=$as_save_IFS
+-
 -fi
 -fi
 -F77=$ac_cv_prog_F77
 -if test -n "$F77"; then
--  echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
+-  { echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6; }
 -else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -fi
  
+ 
 -    test -n "$F77" && break
 -  done
 -fi
 -if test -z "$F77"; then
 -  ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
 -do
 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
 -set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
@@ -12688,48 +4914,78 @@
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_F77="$ac_prog"
 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
 -done
+-IFS=$as_save_IFS
 -
 -fi
 -fi
 -ac_ct_F77=$ac_cv_prog_ac_ct_F77
 -if test -n "$ac_ct_F77"; then
--  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
+-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6; }
 -else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -fi
 -
+-
 -  test -n "$ac_ct_F77" && break
 -done
 -
--  F77=$ac_ct_F77
+-  if test "x$ac_ct_F77" = x; then
+-    F77=""
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&5
+-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    F77=$ac_ct_F77
+-  fi
 -fi
 -
 -
 -# Provide some information about the compiler.
--echo "$as_me:8312:" \
--     "checking for Fortran 77 compiler version" >&5
+-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 -ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
+-{ (ac_try="$ac_compiler -V >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
@@ -12739,8 +4995,8 @@
 -# input file.  (Note that this only needs to work for GNU compilers.)
 -ac_save_ext=$ac_ext
 -ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
 -if test "${ac_cv_f77_compiler_gnu+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -12769,14 +5025,14 @@
 +		     Syntax error
  _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
@@ -12784,15 +5040,23 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -12813,39 +5077,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_compiler_gnu=no
+-	ac_compiler_gnu=no
 +  # Broken: fails on valid input.
 +continue
  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
++rm -f conftest.err conftest.$ac_ext
  
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
 -ac_ext=$ac_save_ext
 -ac_test_FFLAGS=${FFLAGS+set}
--ac_save_FFLAGS=$FFLAGS
--FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
--if test "${ac_cv_prog_f77_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  FFLAGS=-g
--cat >conftest.$ac_ext <<_ACEOF
--      program main
-+rm -f conftest.err conftest.$ac_ext
- 
--      end
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
++_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
@@ -12858,32 +5108,11 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_prog_f77_g=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_prog_f77_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -13251,7 +5480,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
@@ -13259,80 +5488,10 @@
 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
 +ac_ext=$ac_save_ext
 +ac_test_FFLAGS=${FFLAGS+set}
-+ac_save_FFLAGS=$FFLAGS
-+FFLAGS=
-+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_f77_g+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  FFLAGS=-g
-+cat >conftest.$ac_ext <<_ACEOF
-+      program main
-+
-+      end
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_f77_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
-+	ac_cv_prog_f77_g=no
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_f77_g = yes; then
-@@ -8456,13 +10229,13 @@
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- 
- # find the maximum length of command line arguments
--echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+ { echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+@@ -10167,7 +10263,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -13341,7 +5500,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8491,20 +10264,70 @@
+@@ -10196,20 +10292,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -13418,33 +5577,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.
-@@ -8515,19 +10338,19 @@
- fi
- 
- if test -n $lt_cv_sys_max_cmd_len ; then
--  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-+  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
--  echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
-+  { echo "$as_me:$LINENO: result: none" >&5
-+echo "${ECHO_T}none" >&6; }
- fi
- 
- 
- 
- 
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8541,9 +10364,6 @@
+@@ -10246,9 +10392,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -13454,7 +5587,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'"
  
-@@ -8565,14 +10385,30 @@
+@@ -10270,14 +10413,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'"
    ;;
@@ -13487,7 +5620,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8590,14 +10426,17 @@
+@@ -10295,14 +10454,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -13507,41 +5640,8 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8715,15 +10554,15 @@
-   lt_cv_sys_global_symbol_to_cdecl=
- fi
- if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
--  echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
-+  { echo "$as_me:$LINENO: result: failed" >&5
-+echo "${ECHO_T}failed" >&6; }
- else
--  echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6
-+  { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
- fi
+@@ -10464,7 +10626,7 @@
  
--echo "$as_me:$LINENO: checking for objdir" >&5
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for objdir" >&5
-+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
- if test "${lt_cv_objdir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8737,8 +10576,8 @@
- fi
- rmdir .libs 2>/dev/null
- fi
--echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+echo "${ECHO_T}$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
- 
- 
-@@ -8759,7 +10598,7 @@
- 
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
 -Xsed='sed -e s/^X//'
@@ -13549,7 +5649,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8779,7 +10618,7 @@
+@@ -10484,7 +10646,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -13558,313 +5658,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8789,8 +10628,8 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8803,32 +10642,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AR="${ac_tool_prefix}ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
-+  { echo "$as_me:$LINENO: result: $AR" >&5
-+echo "${ECHO_T}$AR" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_AR"; then
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8841,27 +10682,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AR="ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+echo "${ECHO_T}$ac_ct_AR" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  AR=$ac_ct_AR
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AR=$ac_ct_AR
-+  fi
- else
-   AR="$ac_cv_prog_AR"
- fi
-@@ -8869,8 +10724,8 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8883,32 +10738,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_RANLIB"; then
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8921,27 +10778,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  RANLIB=$ac_ct_RANLIB
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    RANLIB=$ac_ct_RANLIB
-+  fi
- else
-   RANLIB="$ac_cv_prog_RANLIB"
- fi
-@@ -8949,8 +10820,8 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8963,32 +10834,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $STRIP" >&5
-+echo "${ECHO_T}$STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
- fi
- if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9001,27 +10874,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+echo "${ECHO_T}$ac_ct_STRIP" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
--  STRIP=$ac_ct_STRIP
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-+  fi
- else
-   STRIP="$ac_cv_prog_STRIP"
- fi
-@@ -9036,6 +10923,7 @@
+@@ -10789,6 +10951,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -13872,7 +5666,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9055,21 +10943,32 @@
+@@ -10808,15 +10971,26 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -13901,15 +5695,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9089,7 +10988,7 @@
+@@ -10842,7 +11016,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13918,31 +5704,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
-@@ -9121,17 +11020,17 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- if test -z "$lt_cv_path_MAGIC_CMD"; then
-   if test -n "$ac_tool_prefix"; then
--    echo "$as_me:$LINENO: checking for file" >&5
--echo $ECHO_N "checking for file... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for file" >&5
-+echo $ECHO_N "checking for file... $ECHO_C" >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9151,7 +11050,7 @@
+@@ -10904,7 +11078,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -13951,52 +5713,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
-@@ -9183,11 +11082,11 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+echo "${ECHO_T}$MAGIC_CMD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-   else
-@@ -9202,21 +11101,21 @@
- enable_dlopen=yes
- enable_win32_dll=no
- 
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
- 
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- 
--# Check whether --with-pic or --without-pic was given.
-+# Check whether --with-pic was given.
- if test "${with_pic+set}" = set; then
--  withval="$with_pic"
--  pic_mode="$withval"
-+  withval=$with_pic; pic_mode="$withval"
- else
-   pic_mode=default
--fi;
-+fi
-+
- test -z "$pic_mode" && pic_mode=default
- 
- # Use C for the default configuration in the libtool script
-@@ -9246,68 +11145,25 @@
+@@ -10999,68 +11173,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14033,8 +5750,8 @@
 -#
 -# Check to make sure the static flag actually works.
 -#
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6; }
 -if test "${lt_prog_compiler_static_works+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -14056,8 +5773,8 @@
 -   LDFLAGS="$save_LDFLAGS"
 -
 -fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
 -
 -if test x"$lt_prog_compiler_static_works" = xyes; then
 -    :
@@ -14080,18 +5797,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9321,8 +11177,8 @@
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9336,26 +11192,28 @@
+@@ -11089,18 +11220,20 @@
     # 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 \
@@ -14099,13 +5805,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9342: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11198: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11095: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11226: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9346: \$? = $ac_status" >&5
-+   echo "$as_me:11202: \$? = $ac_status" >&5
+-   echo "$as_me:11099: \$? = $ac_status" >&5
++   echo "$as_me:11230: \$? = $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
@@ -14117,28 +5823,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9369,8 +11227,8 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl='-Wl,'
-@@ -9408,6 +11266,11 @@
+@@ -11161,6 +11294,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -14150,7 +5835,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9424,7 +11287,7 @@
+@@ -11177,7 +11315,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -14159,7 +5844,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9450,6 +11313,16 @@
+@@ -11203,6 +11341,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -14176,7 +5861,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9461,7 +11334,7 @@
+@@ -11214,7 +11362,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.
@@ -14185,7 +5870,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9485,12 +11358,19 @@
+@@ -11238,12 +11386,19 @@
        ;;
  
      linux*)
@@ -14206,7 +5891,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9505,15 +11385,15 @@
+@@ -11258,15 +11413,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -14228,7 +5913,7 @@
        ;;
  
      sunos4*)
-@@ -9522,7 +11402,7 @@
+@@ -11275,7 +11430,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14237,7 +5922,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9535,6 +11415,17 @@
+@@ -11288,6 +11443,17 @@
        fi
        ;;
  
@@ -14255,28 +5940,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9546,16 +11437,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9569,26 +11460,28 @@
+@@ -11322,18 +11488,20 @@
     # 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 \
@@ -14284,13 +5948,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9575: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11466: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11328: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11494: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9579: \$? = $ac_status" >&5
-+   echo "$as_me:11470: \$? = $ac_status" >&5
+-   echo "$as_me:11332: \$? = $ac_status" >&5
++   echo "$as_me:11498: \$? = $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
@@ -14302,31 +5966,22 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -11354,7 +11522,7 @@
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
  
- if test x"$lt_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-@@ -9601,7 +11494,7 @@
  fi
- 
- fi
 -case "$host_os" in
 +case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9611,8 +11504,50 @@
+@@ -11364,24 +11532,59 @@
      ;;
  esac
  
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -14334,8 +5989,14 @@
 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_cv_prog_compiler_c_o=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 +  lt_prog_compiler_static_works=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -14357,7 +6018,13 @@
 +   fi
 +   $rm conftest*
 +   LDFLAGS="$save_LDFLAGS"
-+
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
 +fi
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
@@ -14371,23 +6038,19 @@
 +
 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9623,60 +11558,58 @@
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
+@@ -11389,25 +11592,30 @@
     # Note that $ac_compile itself does not contain backslashes and begins
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -14395,13 +6058,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9642: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11570: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11395: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11598: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9646: \$? = $ac_status" >&5
-+   echo "$as_me:11574: \$? = $ac_status" >&5
+-   echo "$as_me:11399: \$? = $ac_status" >&5
++   echo "$as_me:11602: \$? = $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
@@ -14425,46 +6088,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9686,8 +11619,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   runpath_var=
-   allow_undefined_flag=
-@@ -9725,6 +11658,16 @@
+@@ -11478,6 +11686,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -14481,7 +6105,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9735,6 +11678,10 @@
+@@ -11488,6 +11706,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -14492,7 +6116,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9745,6 +11692,27 @@
+@@ -11498,6 +11720,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -14520,7 +6144,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9782,7 +11750,7 @@
+@@ -11535,7 +11778,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -14529,7 +6153,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9792,13 +11760,13 @@
+@@ -11545,13 +11788,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'
@@ -14546,7 +6170,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
-@@ -9807,23 +11775,70 @@
+@@ -11560,23 +11803,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -14622,7 +6246,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9837,40 +11852,62 @@
+@@ -11590,13 +11880,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -14635,34 +6259,12 @@
        fi
        ;;
  
--    sunos4*)
--      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
--      ;;
--
--    *)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
- 	ld_shlibs=no
--      fi
--      ;;
--    esac
++	ld_shlibs=no
 +	cat <<_LT_EOF 1>&2
- 
--    if test "$ld_shlibs" = yes; then
--      runpath_var=LD_RUN_PATH
--      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--      export_dynamic_flag_spec='${wl}--export-dynamic'
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++
 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
@@ -14684,24 +6286,33 @@
 +      esac
 +      ;;
 +
-+    sunos4*)
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+     sunos4*)
+       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       wlarc=
+@@ -11606,24 +11923,19 @@
+ 
+     *)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        else
--  	whole_archive_flag_spec=
-+	ld_shlibs=no
+ 	ld_shlibs=no
        fi
-+      ;;
-+    esac
-+
+       ;;
+     esac
+ 
+-    if test "$ld_shlibs" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-      export_dynamic_flag_spec='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	whole_archive_flag_spec=
+-      fi
 +    if test "$ld_shlibs" = no; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec=
@@ -14710,7 +6321,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9882,7 +11919,7 @@
+@@ -11635,7 +11947,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -14719,7 +6330,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9904,9 +11941,21 @@
+@@ -11657,9 +11969,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
@@ -14743,7 +6354,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9923,7 +11972,7 @@
+@@ -11676,7 +12000,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -14752,7 +6363,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`
-@@ -9942,8 +11991,12 @@
+@@ -11695,8 +12019,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -14765,7 +6376,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9951,22 +12004,23 @@
+@@ -11704,22 +12032,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -14796,58 +6407,12 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9982,23 +12036,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10012,19 +12079,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11781,18 +12110,17 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -14865,61 +6430,16 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10043,23 +12111,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10073,7 +12154,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -11857,7 +12185,7 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10083,13 +12166,11 @@
+ 
+@@ -11866,13 +12194,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -14936,7 +6456,7 @@
  	fi
        fi
        ;;
-@@ -10102,7 +12183,7 @@
+@@ -11885,7 +12211,7 @@
        ld_shlibs=no
        ;;
  
@@ -14945,7 +6465,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10112,13 +12193,13 @@
+@@ -11895,13 +12221,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -14962,7 +6482,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.
-@@ -10128,52 +12209,52 @@
+@@ -11911,52 +12237,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -15055,7 +6575,7 @@
      fi
        ;;
  
-@@ -10207,16 +12288,25 @@
+@@ -11990,16 +12316,25 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15063,20 +6583,20 @@
 -      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
-+    kfreebsd*-gnu)
-+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-+      link_all_deplibs=no
        ;;
  
++    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
++    kfreebsd*-gnu)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      link_all_deplibs=no
++      ;;
++
      hpux9*)
        if test "$GCC" = yes; then
 -	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -15084,7 +6604,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
-@@ -10230,47 +12320,62 @@
+@@ -12013,47 +12348,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -15153,25 +6673,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld='+b $libdir'
 -	  hardcode_libdir_separator=:
- 	  hardcode_direct=no
- 	  hardcode_shlibpath_var=no
- 	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec='-L$libdir'
 -	  hardcode_direct=no
 -	  hardcode_shlibpath_var=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec='-L$libdir'
+ 	  hardcode_direct=no
+ 	  hardcode_shlibpath_var=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L=yes
--	  ;;
+ 	  ;;
  	*)
 -	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator=:
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10284,7 +12389,7 @@
+@@ -12067,7 +12417,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -15180,7 +6700,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'
-@@ -10294,7 +12399,7 @@
+@@ -12077,7 +12427,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -15189,7 +6709,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10317,7 +12422,8 @@
+@@ -12100,7 +12450,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
@@ -15199,7 +6719,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10327,7 +12433,7 @@
+@@ -12110,7 +12461,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -15208,7 +6728,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10338,14 +12444,14 @@
+@@ -12121,14 +12472,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -15225,7 +6745,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'
-@@ -10357,13 +12463,13 @@
+@@ -12140,13 +12491,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15241,7 +6761,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10371,21 +12477,15 @@
+@@ -12154,21 +12505,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -15267,7 +6787,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'
-@@ -10394,8 +12494,18 @@
+@@ -12177,8 +12522,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15288,7 +6808,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10404,7 +12514,7 @@
+@@ -12187,7 +12542,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.
@@ -15297,7 +6817,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10452,36 +12562,45 @@
+@@ -12235,36 +12590,45 @@
        fi
        ;;
  
@@ -15364,14 +6884,8 @@
        ;;
  
      uts4*)
-@@ -10496,15 +12615,10 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+echo "${ECHO_T}$ld_shlibs" >&6; }
+@@ -12283,11 +12647,6 @@
+ echo "${ECHO_T}$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -15382,18 +6896,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10522,8 +12636,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -10537,6 +12651,7 @@
+@@ -12320,6 +12679,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -15401,24 +6904,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10559,20 +12674,20 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--echo "${ECHO_T}$archive_cmds_need_lc" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+@@ -12355,7 +12715,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -15427,7 +6913,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10582,7 +12697,20 @@
+@@ -12365,7 +12725,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15449,7 +6935,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10647,7 +12775,7 @@
+@@ -12430,7 +12803,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15458,7 +6944,7 @@
    ;;
  
  beos*)
-@@ -10656,7 +12784,7 @@
+@@ -12439,7 +12812,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -15467,7 +6953,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10672,7 +12800,7 @@
+@@ -12455,7 +12828,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -15476,7 +6962,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10684,7 +12812,8 @@
+@@ -12467,7 +12840,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -15486,7 +6972,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10714,7 +12843,7 @@
+@@ -12497,7 +12871,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15495,7 +6981,7 @@
        ;;
      esac
      ;;
-@@ -10737,7 +12866,7 @@
+@@ -12520,7 +12894,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -15504,7 +6990,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"`
-@@ -10760,7 +12889,7 @@
+@@ -12543,7 +12917,7 @@
    dynamic_linker=no
    ;;
  
@@ -15513,7 +6999,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10772,8 +12901,17 @@
+@@ -12555,8 +12929,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -15533,7 +7019,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10791,14 +12929,19 @@
+@@ -12574,14 +12957,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -15555,7 +7041,7 @@
    esac
    ;;
  
-@@ -10818,9 +12961,9 @@
+@@ -12601,9 +12989,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -15567,7 +7053,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10835,7 +12978,7 @@
+@@ -12618,7 +13006,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -15576,7 +7062,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10846,7 +12989,7 @@
+@@ -12629,7 +13017,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -15585,7 +7071,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10858,6 +13001,18 @@
+@@ -12641,6 +13029,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -15604,7 +7090,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10908,22 +13063,19 @@
+@@ -12691,22 +13091,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -15633,7 +7119,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,
-@@ -10933,6 +13085,30 @@
+@@ -12716,6 +13113,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -15664,7 +7150,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10942,7 +13118,7 @@
+@@ -12725,7 +13146,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -15673,7 +7159,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10970,8 +13146,13 @@
+@@ -12753,8 +13174,13 @@
  
  openbsd*)
    version_type=sunos
@@ -15688,7 +7174,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
-@@ -10991,7 +13172,7 @@
+@@ -12774,7 +13200,7 @@
  
  os2*)
    libname_spec='$name'
@@ -15697,7 +7183,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11009,13 +13190,6 @@
+@@ -12792,13 +13218,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -15711,7 +7197,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11041,7 +13215,7 @@
+@@ -12824,7 +13243,7 @@
    need_version=yes
    ;;
  
@@ -15720,7 +7206,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'
-@@ -11074,6 +13248,29 @@
+@@ -12857,6 +13276,29 @@
    fi
    ;;
  
@@ -15750,25 +7236,17 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11085,16 +13282,21 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
+@@ -12872,12 +13314,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
 -   test -n "$runpath_var " || \
@@ -15778,722 +7256,70 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11114,8 +13316,8 @@
-   # directories.
-   hardcode_action=unsupported
+@@ -13036,7 +13483,7 @@
+ 	ac_cv_lib_dl_dlopen=no
  fi
--echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+echo "${ECHO_T}$hardcode_action" >&6; }
  
- if test "$hardcode_action" = relink; then
-   # Fast installation is not supported
-@@ -11128,29 +13330,29 @@
- 
- striplib=
- old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
- if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
-   case $host_os in
-    darwin*)
-        if test -n "$STRIP" ; then
-          striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-        else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-        ;;
-    *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     ;;
-   esac
- fi
-@@ -11182,8 +13384,8 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11196,39 +13398,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11237,14 +13452,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
-@@ -11258,8 +13474,8 @@
-    ;;
- 
-   *)
--    echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for shl_load" >&5
-+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11286,52 +13502,59 @@
- 
- #undef shl_load
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_load ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shl_load) || defined (__stub___shl_load)
-+#if defined __stub_shl_load || defined __stub___shl_load
- choke me
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != shl_load;
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11340,18 +13563,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
+@@ -13147,7 +13594,7 @@
+ 	ac_cv_func_shl_load=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
- if test $ac_cv_func_shl_load = yes; then
-   lt_cv_dlopen="shl_load"
- else
--  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11364,39 +13588,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_load ();
- int
- main ()
- {
--shl_load ();
-+return shl_load ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11405,19 +13642,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
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+@@ -13226,7 +13673,7 @@
+ 	ac_cv_lib_dld_shl_load=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
- else
--  echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11444,52 +13682,59 @@
- 
- #undef dlopen
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
-+#if defined __stub_dlopen || defined __stub___dlopen
- choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != dlopen;
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11498,18 +13743,19 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_dlopen=no
-+	ac_cv_func_dlopen=no
+@@ -13327,7 +13774,7 @@
+ 	ac_cv_func_dlopen=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
-   lt_cv_dlopen="dlopen"
- else
--  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11522,39 +13768,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11563,19 +13822,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
+ { echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+@@ -13406,7 +13853,7 @@
+ 	ac_cv_lib_dl_dlopen=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
--  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11588,39 +13848,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11629,19 +13902,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
+@@ -13486,7 +13933,7 @@
+ 	ac_cv_lib_svld_dlopen=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
- if test $ac_cv_lib_svld_dlopen = yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
--  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11654,39 +13928,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dld_link ();
- int
- main ()
- {
--dld_link ();
-+return dld_link ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11695,14 +13982,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
+@@ -13566,7 +14013,7 @@
+ 	ac_cv_lib_dld_dld_link=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
- fi
-@@ -11737,13 +14025,13 @@
+@@ -13606,7 +14053,7 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -16502,24 +7328,16 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11753,7 +14041,7 @@
+@@ -13622,7 +14069,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11756 "configure"
-+#line 14044 "configure"
+-#line 13625 "configure"
++#line 14072 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11810,6 +14098,8 @@
+@@ -13679,6 +14126,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16528,7 +7346,7 @@
  
      exit (status);
  }
-@@ -11819,12 +14109,12 @@
+@@ -13688,12 +14137,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16543,35 +7361,25 @@
      esac
    else :
      # compilation failed
-@@ -11835,13 +14125,13 @@
+@@ -13708,7 +14157,7 @@
+ echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
  
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
- 
      if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+       { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+ echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
  if test "${lt_cv_dlopen_self_static+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11851,7 +14141,7 @@
+@@ -13720,7 +14169,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11854 "configure"
-+#line 14144 "configure"
+-#line 13723 "configure"
++#line 14172 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11908,6 +14198,8 @@
+@@ -13777,6 +14226,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16580,7 +7388,7 @@
  
      exit (status);
  }
-@@ -11917,12 +14209,12 @@
+@@ -13786,12 +14237,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16595,38 +7403,17 @@
      esac
    else :
      # compilation failed
-@@ -11933,8 +14225,8 @@
- 
- 
+@@ -13824,7 +14275,7 @@
  fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-     fi
  
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -11955,19 +14247,19 @@
- fi
  
- 
 -# Report which librarie types wil actually be built
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
 +# Report which library types will actually be built
-+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+echo "${ECHO_T}$can_build_shared" >&6; }
+ { echo "$as_me:$LINENO: checking 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
+@@ -13836,7 +14287,7 @@
  
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
- 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -16634,7 +7421,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -11976,58 +14268,21 @@
+@@ -13845,47 +14296,10 @@
    fi
    ;;
  
@@ -16682,25 +7469,8 @@
 -  fi
      ;;
  esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
- 
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
- 
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12042,7 +14297,8 @@
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -13911,7 +14325,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.
@@ -16710,7 +7480,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 \
-@@ -12156,11 +14412,11 @@
+@@ -14025,11 +14440,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -16724,7 +7494,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12190,6 +14446,12 @@
+@@ -14059,6 +14474,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -16737,7 +7507,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12201,6 +14463,9 @@
+@@ -14070,6 +14491,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -16747,7 +7517,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12220,7 +14485,7 @@
+@@ -14089,7 +14513,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -16756,7 +7526,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12251,7 +14516,7 @@
+@@ -14120,7 +14544,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -16765,7 +7535,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12266,7 +14531,7 @@
+@@ -14135,7 +14559,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -16774,7 +7544,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12493,7 +14758,10 @@
+@@ -14362,7 +14786,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.
@@ -16786,23 +7556,7 @@
  fi
  
  
-@@ -12506,11 +14774,11 @@
- CC="$lt_save_CC"
- 
- 
--# Check whether --with-tags or --without-tags was given.
-+# Check whether --with-tags was given.
- if test "${with_tags+set}" = set; then
--  withval="$with_tags"
--  tagnames="$withval"
--fi;
-+  withval=$with_tags; tagnames="$withval"
-+fi
-+
- 
- if test -f "$ltmain" && test -n "$tagnames"; then
-   if test ! -f "${ofile}"; then
-@@ -12528,6 +14796,9 @@
+@@ -14397,6 +14824,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -16812,20 +7566,18 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12558,8 +14829,10 @@
+@@ -14427,7 +14857,9 @@
  
        case $tagname in
        CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
--	  ac_ext=cc
 +	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +	    (test "X$CXX" != "Xg++"))) ; then
-+	  ac_ext=cpp
+ 	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12578,6 +14851,7 @@
+@@ -14447,6 +14879,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -16833,7 +7585,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12595,7 +14869,7 @@
+@@ -14464,7 +14897,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -16842,7 +7594,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12605,17 +14879,34 @@
+@@ -14474,17 +14907,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -16878,7 +7630,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12626,18 +14917,27 @@
+@@ -14495,18 +14945,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -16909,48 +7661,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12651,18 +14951,18 @@
-   # Set up default GNU C++ configuration
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -12691,11 +14991,11 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12708,7 +15008,7 @@
+@@ -14577,7 +15036,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,
@@ -16959,27 +7670,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'*)
-@@ -12728,21 +15028,21 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
- echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+@@ -14611,7 +15070,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -16988,18 +7679,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12752,8 +15052,8 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
-@@ -12761,8 +15061,8 @@
+@@ -14630,8 +15089,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
@@ -17010,7 +7690,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12788,7 +15088,7 @@
+@@ -14657,7 +15116,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.
@@ -17019,18 +7699,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12803,8 +15103,8 @@
- fi
- 
- # PORTME: fill in a description of your system's C++ link characteristics
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- ld_shlibs_CXX=yes
- case $host_os in
-   aix3*)
-@@ -12819,8 +15119,23 @@
+@@ -14688,8 +15147,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -17056,7 +7725,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12837,7 +15152,7 @@
+@@ -14706,7 +15180,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -17065,7 +7734,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`
-@@ -12856,8 +15171,12 @@
+@@ -14725,8 +15199,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -17078,7 +7747,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12866,15 +15185,16 @@
+@@ -14735,15 +15213,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -17099,58 +7768,12 @@
      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.
-@@ -12896,23 +15216,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -12926,20 +15259,21 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14811,19 +15290,18 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -17168,61 +7791,16 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12958,23 +15292,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -12988,7 +15335,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -14888,7 +15366,7 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12998,16 +15347,26 @@
+ 
+@@ -14897,16 +15375,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17254,7 +7832,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13021,12 +15380,12 @@
+@@ -14920,12 +15408,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'
@@ -17269,7 +7847,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
-@@ -13035,70 +15394,81 @@
+@@ -14934,70 +15422,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -17316,7 +7894,15 @@
 -    *) # Darwin 1.3 on
 -      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
 -	allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--      else
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+       else
 -	case ${MACOSX_DEPLOYMENT_TARGET} in
 -	  10.012)
 -	    allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -17325,11 +7911,30 @@
 -	    allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup'
 -	    ;;
 -	esac
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
        fi
 -      ;;
 -    esac
@@ -17361,34 +7966,6 @@
 -    ld_shlibs_CXX=no
 -  fi
 -    ;;
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      else
-+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         ld_shlibs_CXX=no
-+          ;;
-+      esac
-+      fi
 +        ;;
  
    dgux*)
@@ -17403,7 +7980,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13109,14 +15479,14 @@
+@@ -15008,14 +15507,14 @@
  	;;
      esac
      ;;
@@ -17420,7 +7997,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13133,12 +15503,12 @@
+@@ -15032,12 +15531,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -17436,7 +8013,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13147,11 +15517,11 @@
+@@ -15046,11 +15545,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.
@@ -17450,7 +8027,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13161,33 +15531,22 @@
+@@ -15060,33 +15559,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -17491,7 +8068,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13198,17 +15557,20 @@
+@@ -15097,17 +15585,20 @@
      esac
  
      case $cc_basename in
@@ -17518,7 +8095,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13224,12 +15586,15 @@
+@@ -15123,12 +15614,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -17538,7 +8115,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13240,11 +15605,25 @@
+@@ -15139,11 +15633,25 @@
  	;;
      esac
      ;;
@@ -17566,7 +8143,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13255,9 +15634,9 @@
+@@ -15154,9 +15662,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -17578,7 +8155,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13268,14 +15647,14 @@
+@@ -15167,14 +15675,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -17596,7 +8173,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13293,20 +15672,44 @@
+@@ -15192,20 +15700,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -17647,7 +8224,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13334,7 +15737,7 @@
+@@ -15233,7 +15765,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -17656,7 +8233,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13344,7 +15747,7 @@
+@@ -15243,7 +15775,7 @@
  	;;
      esac
      ;;
@@ -17665,7 +8242,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=
-@@ -13355,15 +15758,31 @@
+@@ -15254,15 +15786,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::"'
      ;;
@@ -17699,7 +8276,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13373,14 +15792,14 @@
+@@ -15272,14 +15820,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -17717,7 +8294,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13398,7 +15817,7 @@
+@@ -15297,7 +15845,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17726,7 +8303,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13417,13 +15836,13 @@
+@@ -15316,13 +15864,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -17742,7 +8319,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13432,17 +15851,17 @@
+@@ -15331,17 +15879,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -17764,7 +8341,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13461,7 +15880,7 @@
+@@ -15360,7 +15908,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -17773,7 +8350,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13482,27 +15901,14 @@
+@@ -15381,27 +15929,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -17803,7 +8380,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13515,36 +15921,33 @@
+@@ -15414,36 +15949,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -17852,7 +8429,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13552,9 +15955,9 @@
+@@ -15451,9 +15983,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -17864,7 +8441,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13564,9 +15967,9 @@
+@@ -15463,9 +15995,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
@@ -17876,7 +8453,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13575,9 +15978,9 @@
+@@ -15474,9 +16006,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -17888,7 +8465,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13590,12 +15993,63 @@
+@@ -15489,12 +16021,63 @@
  	;;
      esac
      ;;
@@ -17954,18 +8531,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13615,8 +16069,8 @@
-     ld_shlibs_CXX=no
-     ;;
- esac
--echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- GCC_CXX="$GXX"
-@@ -13652,7 +16106,7 @@
+@@ -15551,7 +16134,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.
@@ -17974,7 +8540,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13692,7 +16146,7 @@
+@@ -15591,7 +16174,7 @@
         fi
         ;;
  
@@ -17983,7 +8549,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13728,6 +16182,29 @@
+@@ -15627,6 +16210,29 @@
  
  $rm -f confest.$objext
  
@@ -18013,18 +8579,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13736,8 +16213,8 @@
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -13775,6 +16252,10 @@
+@@ -15674,6 +16280,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -18035,7 +8590,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13783,7 +16264,7 @@
+@@ -15682,7 +16292,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18044,7 +8599,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13808,18 +16289,28 @@
+@@ -15707,18 +16317,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -18076,7 +8631,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13827,22 +16318,22 @@
+@@ -15726,22 +16346,22 @@
  	    ;;
  	esac
  	;;
@@ -18105,7 +8660,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13855,9 +16346,13 @@
+@@ -15754,9 +16374,13 @@
  	    ;;
  	esac
  	;;
@@ -18120,7 +8675,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13868,18 +16363,24 @@
+@@ -15767,18 +16391,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -18148,7 +8703,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13896,25 +16397,25 @@
+@@ -15795,25 +16425,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -18179,7 +8734,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13928,24 +16429,15 @@
+@@ -15827,24 +16457,15 @@
  	;;
        psos*)
  	;;
@@ -18206,7 +8761,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13955,12 +16447,12 @@
+@@ -15854,12 +16475,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -18221,7 +8776,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13970,7 +16462,7 @@
+@@ -15869,7 +16490,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -18230,7 +8785,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -13978,7 +16470,14 @@
+@@ -15877,7 +16498,14 @@
  	    ;;
  	esac
  	;;
@@ -18246,28 +8801,7 @@
  	;;
        vxworks*)
  	;;
-@@ -13988,16 +16487,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14011,26 +16510,28 @@
+@@ -15910,18 +16538,20 @@
     # 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 \
@@ -18275,13 +8809,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14017: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16516: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15916: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16544: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14021: \$? = $ac_status" >&5
-+   echo "$as_me:16520: \$? = $ac_status" >&5
+-   echo "$as_me:15920: \$? = $ac_status" >&5
++   echo "$as_me:16548: \$? = $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
@@ -18293,32 +8827,19 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -15942,7 +16572,7 @@
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
  
- if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-     case $lt_prog_compiler_pic_CXX in
-@@ -14043,7 +16544,7 @@
  fi
- 
- fi
 -case "$host_os" in
 +case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14053,72 +16554,112 @@
+@@ -15952,6 +16582,48 @@
      ;;
  esac
  
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -18326,30 +8847,8 @@
 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_cv_prog_compiler_c_o_CXX=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
--   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  lt_prog_compiler_static_works_CXX=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -18383,34 +8882,37 @@
 +fi
 +
 +
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
+@@ -15964,38 +16636,36 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14084: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16620: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15983: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16648: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14088: \$? = $ac_status" >&5
-+   echo "$as_me:16624: \$? = $ac_status" >&5
+-   echo "$as_me:15987: \$? = $ac_status" >&5
++   echo "$as_me:16652: \$? = $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
@@ -18434,46 +8936,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14128,8 +16669,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
-@@ -14146,22 +16687,23 @@
+@@ -16045,7 +16715,13 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -18488,13 +8951,8 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   esac
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -16056,11 +16732,6 @@
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -18505,18 +8963,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14179,8 +16721,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -14194,6 +16736,7 @@
+@@ -16093,6 +16764,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -18524,24 +8971,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14216,20 +16759,20 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+@@ -16128,7 +16800,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -18550,7 +8980,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14239,7 +16782,20 @@
+@@ -16138,7 +16810,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18572,7 +9002,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14304,7 +16860,7 @@
+@@ -16203,7 +16888,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18581,7 +9011,7 @@
    ;;
  
  beos*)
-@@ -14313,7 +16869,7 @@
+@@ -16212,7 +16897,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -18590,7 +9020,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14329,7 +16885,7 @@
+@@ -16228,7 +16913,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -18599,7 +9029,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14341,7 +16897,8 @@
+@@ -16240,7 +16925,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -18609,7 +9039,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14371,7 +16928,7 @@
+@@ -16270,7 +16956,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18618,7 +9048,7 @@
        ;;
      esac
      ;;
-@@ -14394,7 +16951,7 @@
+@@ -16293,7 +16979,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -18627,7 +9057,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"`
-@@ -14417,7 +16974,7 @@
+@@ -16316,7 +17002,7 @@
    dynamic_linker=no
    ;;
  
@@ -18636,7 +9066,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14429,8 +16986,17 @@
+@@ -16328,8 +17014,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -18656,7 +9086,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14448,14 +17014,19 @@
+@@ -16347,14 +17042,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -18678,7 +9108,7 @@
    esac
    ;;
  
-@@ -14475,9 +17046,9 @@
+@@ -16374,9 +17074,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -18690,7 +9120,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14492,7 +17063,7 @@
+@@ -16391,7 +17091,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -18699,7 +9129,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14503,7 +17074,7 @@
+@@ -16402,7 +17102,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -18708,7 +9138,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14515,6 +17086,18 @@
+@@ -16414,6 +17114,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -18727,7 +9157,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14565,22 +17148,19 @@
+@@ -16464,22 +17176,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -18756,14 +9186,18 @@
    # 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,
-@@ -14590,6 +17170,30 @@
+@@ -16489,16 +17198,40 @@
    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'
 +  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
@@ -18784,10 +9218,12 @@
 +  dynamic_linker='GNU ld.so'
 +  ;;
 +
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14599,7 +17203,7 @@
++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
@@ -18796,7 +9232,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14627,8 +17231,13 @@
+@@ -16526,8 +17259,13 @@
  
  openbsd*)
    version_type=sunos
@@ -18811,7 +9247,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
-@@ -14648,7 +17257,7 @@
+@@ -16547,7 +17285,7 @@
  
  os2*)
    libname_spec='$name'
@@ -18820,7 +9256,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14666,13 +17275,6 @@
+@@ -16565,13 +17303,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -18834,7 +9270,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14698,7 +17300,7 @@
+@@ -16597,7 +17328,7 @@
    need_version=yes
    ;;
  
@@ -18843,7 +9279,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'
-@@ -14731,6 +17333,29 @@
+@@ -16630,6 +17361,29 @@
    fi
    ;;
  
@@ -18873,25 +9309,17 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14742,16 +17367,21 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
+@@ -16645,12 +17399,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
 -   test -n "$runpath_var CXX" || \
@@ -18901,46 +9329,35 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14771,8 +17401,8 @@
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--echo "${ECHO_T}$hardcode_action_CXX" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
- 
- if test "$hardcode_action_CXX" = relink; then
-   # Fast installation is not supported
-@@ -14783,1145 +17413,327 @@
+@@ -16682,1216 +17441,312 @@
    enable_fast_install=needless
  fi
  
 -striplib=
 -old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
 -  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
 -  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -else
 -# FIXME - insert some real tests, host_os isn't really good enough
 -  case $host_os in
 -   darwin*)
 -       if test -n "$STRIP" ; then
 -         striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-         { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -fi
 -       ;;
 -   *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 +
 +# The else clause should only fire when bootstrapping the
 +# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -19062,8 +9479,8 @@
  
 -  darwin*)
 -  # if libdl is installed we need to link against it
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19078,39 +9495,52 @@
 +# Whether or not to build shared libraries.
 +build_libtool_libs=$enable_shared
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -19121,39 +9551,44 @@
 +# Whether or not to build static libraries.
 +build_old_libs=$enable_static
  
--ac_cv_lib_dl_dlopen=no
+-	ac_cv_lib_dl_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
  
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
- 
--fi
 +# Whether or not to optimize for fast installation.
 +fast_install=$enable_fast_install
  
--   ;;
+-fi
 +# The host system.
 +host_alias=$host_alias
 +host=$host
 +host_os=$host_os
  
+-   ;;
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
 -  *)
--    echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 -if test "${ac_cv_func_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19166,79 +9601,84 @@
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
- 
--#undef shl_load
 +# A C compiler.
 +LTCC=$lt_LTCC
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-#undef shl_load
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-#if defined __stub_shl_load || defined __stub___shl_load
 -choke me
--#else
--char (*f) () = shl_load;
 -#endif
--#ifdef __cplusplus
--}
--#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# A language-specific compiler.
++CC=$lt_compiler_CXX
  
 -int
 -main ()
 -{
--return f != shl_load;
+-return shl_load ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -19246,21 +9686,24 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
  
--ac_cv_func_shl_load=no
+-	ac_cv_func_shl_load=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+-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
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
 -if test $ac_cv_func_shl_load = yes; then
 -  lt_cv_dlopen="shl_load"
 -else
--  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19272,42 +9715,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# The linker used to build libraries.
++LD=$lt_LD_CXX
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -int
 -main ()
 -{
--shl_load ();
+-return shl_load ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -19315,22 +9771,25 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
--ac_cv_lib_dld_shl_load=no
+-	ac_cv_lib_dld_shl_load=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# A BSD-compatible nm program.
++NM=$lt_NM
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 -if test $ac_cv_lib_dld_shl_load = yes; then
 -  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 -else
--  echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 -if test "${ac_cv_func_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19343,76 +9802,83 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# A symbol stripping program
++STRIP=$lt_STRIP
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
 -#undef dlopen
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-#if defined __stub_dlopen || defined __stub___dlopen
 -choke me
--#else
--char (*f) () = dlopen;
 -#endif
--#ifdef __cplusplus
--}
--#endif
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# Used on cygwin: assembler.
++AS="$AS"
  
 -int
 -main ()
 -{
--return f != dlopen;
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -19420,21 +9886,25 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
--ac_cv_func_dlopen=no
+-	ac_cv_func_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
+ 
+-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
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
 -if test $ac_cv_func_dlopen = yes; then
 -  lt_cv_dlopen="dlopen"
 -else
--  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19446,42 +9916,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -19489,22 +9972,25 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: assembler.
-+AS="$AS"
++# Object file suffix (normally "o").
++objext="$ac_objext"
  
--ac_cv_lib_dl_dlopen=no
+-	ac_cv_lib_dl_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# Old archive suffix (normally "a").
++libext="$libext"
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
--  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19516,42 +10002,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -19559,23 +10058,26 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# Executable file suffix (normally "").
++exeext="$exeext"
  
--ac_cv_lib_svld_dlopen=no
+-	ac_cv_lib_svld_dlopen=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 -if test $ac_cv_lib_svld_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 -else
--  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19587,42 +10089,55 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
  
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dld_link ();
 -int
 -main ()
 -{
--dld_link ();
+-return dld_link ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
 -	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -19630,91 +10145,97 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
--ac_cv_lib_dld_dld_link=no
+-	ac_cv_lib_dld_dld_link=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+ 
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
-+# Old archive suffix (normally "a").
-+libext="$libext"
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
  
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
++# Do we need a version for libraries?
++need_version=$need_version
  
 -fi
-+# Executable file suffix (normally "").
-+exeext="$exeext"
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
  
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
-+pic_mode=$pic_mode
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -fi
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -fi
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -fi
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
  
 -fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Library versioning type.
++version_type=$version_type
  
 -    ;;
 -  esac
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
  
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -    save_LDFLAGS="$LDFLAGS"
 -    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 -if test "${lt_cv_dlopen_self+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19724,20 +10245,24 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15413 "configure"
+-#line 17398 "configure"
 -#include "confdefs.h"
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Library versioning type.
-+version_type=$version_type
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
  
 -#include <stdio.h>
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -19748,9 +10273,9 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -19773,25 +10298,25 @@
 -#    endif
 -#  endif
 -#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
  
 -  if (self)
 -    {
@@ -19799,8 +10324,9 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
  
 -    exit (status);
 -}
@@ -19823,27 +10349,23 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
  
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
 -fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
  
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 -if test "${lt_cv_dlopen_self_static+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -19853,24 +10375,19 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15511 "configure"
+-#line 17496 "configure"
 -#include "confdefs.h"
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
  
 -#include <stdio.h>
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -19880,10 +10397,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
- 
+-
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -19905,33 +10419,24 @@
 -#    endif
 -#  endif
 -#endif
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
- 
+-
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
- 
+-
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -19953,43 +10458,31 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
- 
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
- 
+-
+-
 -fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
 -    fi
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
- 
+-
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- 
+-
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
- 
+-
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
 -fi
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- 
 -
+-
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
 -# with your package, and you will get complaints that there are
@@ -20285,27 +10778,12 @@
 -
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
  
- # This is the shared library path variable.
- shlibpath_var=$shlibpath_var
-@@ -16003,7 +17815,10 @@
+ # Same as above, but a single script fragment to be evaled but not shown.
+ finish_eval=$lt_finish_eval
+@@ -17988,7 +17843,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.
@@ -20317,7 +10795,7 @@
  fi
  
  
-@@ -16075,29 +17890,55 @@
+@@ -18060,16 +17918,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -20359,21 +10837,10 @@
 +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 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 if libtool supports shared libraries" >&5
+ echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
+@@ -18082,7 +17966,7 @@
  
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
- test "$can_build_shared" = "no" && enable_shared=no
- 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -20381,7 +10848,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16105,21 +17946,21 @@
+@@ -18090,8 +17974,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -20393,38 +10860,17 @@
 +  fi
    ;;
  esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
-+{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-+echo "${ECHO_T}$enable_shared" >&6; }
+ { echo "$as_me:$LINENO: result: $enable_shared" >&5
+@@ -18104,8 +17990,6 @@
+ { echo "$as_me:$LINENO: result: $enable_static" >&5
+ echo "${ECHO_T}$enable_static" >&6; }
  
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
- # Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
--
 -test "$ld_shlibs_F77" = no && can_build_shared=no
-+{ echo "$as_me:$LINENO: result: $enable_static" >&5
-+echo "${ECHO_T}$enable_static" >&6; }
- 
+-
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16128,8 +17969,8 @@
- lt_prog_compiler_pic_F77=
- lt_prog_compiler_static_F77=
  
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_F77='-Wl,'
-@@ -16167,6 +18008,11 @@
+@@ -18152,6 +18036,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -20436,7 +10882,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16183,7 +18029,7 @@
+@@ -18168,7 +18057,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -20445,7 +10891,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16209,6 +18055,16 @@
+@@ -18194,6 +18083,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -20462,7 +10908,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16220,7 +18076,7 @@
+@@ -18205,7 +18104,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.
@@ -20471,7 +10917,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16244,12 +18100,19 @@
+@@ -18229,12 +18128,19 @@
        ;;
  
      linux*)
@@ -20492,7 +10938,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16264,15 +18127,15 @@
+@@ -18249,15 +18155,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -20514,7 +10960,7 @@
        ;;
  
      sunos4*)
-@@ -16281,7 +18144,7 @@
+@@ -18266,7 +18172,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20523,7 +10969,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16294,6 +18157,17 @@
+@@ -18279,6 +18185,17 @@
        fi
        ;;
  
@@ -20541,28 +10987,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16305,16 +18179,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16328,26 +18202,28 @@
+@@ -18313,18 +18230,20 @@
     # 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 \
@@ -20570,13 +10995,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16334: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18208: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18319: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18236: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16338: \$? = $ac_status" >&5
-+   echo "$as_me:18212: \$? = $ac_status" >&5
+-   echo "$as_me:18323: \$? = $ac_status" >&5
++   echo "$as_me:18240: \$? = $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
@@ -20588,31 +11013,19 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -18345,7 +18264,7 @@
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
  
- if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-     case $lt_prog_compiler_pic_F77 in
-@@ -16360,7 +18236,7 @@
  fi
- 
- fi
 -case "$host_os" in
 +case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16370,8 +18246,50 @@
+@@ -18355,6 +18274,48 @@
      ;;
  esac
  
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -20655,12 +11068,10 @@
 +fi
 +
 +
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16382,60 +18300,58 @@
+@@ -18367,38 +18328,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -20681,13 +11092,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16401: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18312: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18386: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18340: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16405: \$? = $ac_status" >&5
-+   echo "$as_me:18316: \$? = $ac_status" >&5
+-   echo "$as_me:18390: \$? = $ac_status" >&5
++   echo "$as_me:18344: \$? = $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
@@ -20711,46 +11122,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16445,8 +18361,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   runpath_var=
-   allow_undefined_flag_F77=
-@@ -16484,6 +18400,16 @@
+@@ -18469,6 +18428,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -20767,7 +11139,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16494,6 +18420,10 @@
+@@ -18479,6 +18448,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -20778,7 +11150,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16504,6 +18434,27 @@
+@@ -18489,6 +18462,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -20806,7 +11178,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16541,7 +18492,7 @@
+@@ -18526,7 +18520,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -20815,7 +11187,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16551,13 +18502,13 @@
+@@ -18536,13 +18530,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'
@@ -20832,7 +11204,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
-@@ -16566,23 +18517,70 @@
+@@ -18551,23 +18545,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -20909,7 +11281,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16596,13 +18594,40 @@
+@@ -18581,13 +18622,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20952,7 +11324,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16612,24 +18637,19 @@
+@@ -18597,24 +18665,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20984,7 +11356,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16641,7 +18661,7 @@
+@@ -18626,7 +18689,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -20993,7 +11365,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16663,9 +18683,21 @@
+@@ -18648,9 +18711,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
@@ -21017,7 +11389,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16682,7 +18714,7 @@
+@@ -18667,7 +18742,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -21026,7 +11398,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`
-@@ -16701,8 +18733,12 @@
+@@ -18686,8 +18761,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -21039,7 +11411,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16710,44 +18746,58 @@
+@@ -18695,22 +18774,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -21070,56 +11442,12 @@
        program main
  
        end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -16761,19 +18811,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18762,18 +18842,17 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -21137,61 +11465,16 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16782,23 +18833,36 @@
-       end
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -16812,7 +18876,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18828,7 +18907,7 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16822,13 +18888,11 @@
+ 
+@@ -18837,13 +18916,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -21208,7 +11491,7 @@
  	fi
        fi
        ;;
-@@ -16841,7 +18905,7 @@
+@@ -18856,7 +18933,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -21217,7 +11500,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16851,68 +18915,68 @@
+@@ -18866,68 +18943,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -21242,25 +11525,6 @@
  
      darwin* | rhapsody*)
 -    if test "$GXX" = yes ; then
--      archive_cmds_need_lc_F77=no
--      case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
--	;;
--      *) # Darwin 1.3 on
--	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	else
--	  case ${MACOSX_DEPLOYMENT_TARGET} in
--	    10.012)
--	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
--	      ;;
--	    10.*)
--	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
--	      ;;
--	  esac
--	fi
--	;;
 +      case $host_os in
 +        rhapsody* | darwin1.[012])
 +         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
@@ -21279,7 +11543,27 @@
 +           esac
 +         fi
 +         ;;
-       esac
++      esac
+       archive_cmds_need_lc_F77=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[012])
+-	allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress'
+-	;;
+-      *) # Darwin 1.3 on
+-	if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-	  allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	else
+-	  case ${MACOSX_DEPLOYMENT_TARGET} in
+-	    10.012)
+-	      allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+-	      ;;
+-	    10.*)
+-	      allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup'
+-	      ;;
+-	  esac
+-	fi
+-	;;
+-      esac
 -    	lt_int_apple_cc_single_mod=no
 -    	output_verbose_link_cmd='echo'
 -    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -21298,7 +11582,6 @@
 -          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -        fi
 -          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_cmds_need_lc_F77=no
        hardcode_direct_F77=no
        hardcode_automatic_F77=yes
        hardcode_shlibpath_var_F77=unsupported
@@ -21330,7 +11613,7 @@
      fi
        ;;
  
-@@ -16946,16 +19010,25 @@
+@@ -18961,16 +19038,25 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21359,7 +11642,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
-@@ -16969,47 +19042,62 @@
+@@ -18984,47 +19070,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -21446,7 +11729,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17023,7 +19111,7 @@
+@@ -19038,7 +19139,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -21455,7 +11738,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'
-@@ -17033,7 +19121,7 @@
+@@ -19048,7 +19149,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -21464,7 +11747,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
-@@ -17056,7 +19144,8 @@
+@@ -19071,7 +19172,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
@@ -21474,7 +11757,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17066,7 +19155,7 @@
+@@ -19081,7 +19183,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -21483,7 +11766,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17077,14 +19166,14 @@
+@@ -19092,14 +19194,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -21500,7 +11783,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'
-@@ -17096,13 +19185,13 @@
+@@ -19111,13 +19213,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21516,7 +11799,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17110,21 +19199,15 @@
+@@ -19125,21 +19227,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -21542,7 +11825,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'
-@@ -17133,8 +19216,18 @@
+@@ -19148,8 +19244,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21563,7 +11846,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17143,7 +19236,7 @@
+@@ -19158,7 +19264,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.
@@ -21572,7 +11855,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17191,36 +19284,45 @@
+@@ -19206,36 +19312,45 @@
        fi
        ;;
  
@@ -21639,14 +11922,8 @@
        ;;
  
      uts4*)
-@@ -17235,15 +19337,10 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--echo "${ECHO_T}$ld_shlibs_F77" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-+echo "${ECHO_T}$ld_shlibs_F77" >&6; }
+@@ -19254,11 +19369,6 @@
+ echo "${ECHO_T}$ld_shlibs_F77" >&6; }
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -21657,18 +11934,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17261,8 +19358,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -17276,6 +19373,7 @@
+@@ -19291,6 +19401,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -21676,24 +11942,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17298,20 +19396,20 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+@@ -19326,7 +19437,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -21702,13 +11951,11 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17321,9 +19419,22 @@
+@@ -19336,7 +19447,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
 -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--need_lib_prefix=unknown
--hardcode_into_libs=no
 +if test "$GCC" = yes; then
 +  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 +  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
@@ -21723,12 +11970,10 @@
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
  
- # when you set need_version to no, make sure it does not cause -set_version
- # flags to be left without arguments
-@@ -17386,7 +19497,7 @@
+@@ -19401,7 +19525,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21737,7 +11982,7 @@
    ;;
  
  beos*)
-@@ -17395,7 +19506,7 @@
+@@ -19410,7 +19534,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -21746,7 +11991,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17411,7 +19522,7 @@
+@@ -19426,7 +19550,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -21755,7 +12000,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17423,7 +19534,8 @@
+@@ -19438,7 +19562,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -21765,7 +12010,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17453,7 +19565,7 @@
+@@ -19468,7 +19593,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21774,7 +12019,7 @@
        ;;
      esac
      ;;
-@@ -17476,7 +19588,7 @@
+@@ -19491,7 +19616,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -21783,7 +12028,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"`
-@@ -17499,7 +19611,7 @@
+@@ -19514,7 +19639,7 @@
    dynamic_linker=no
    ;;
  
@@ -21792,7 +12037,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17511,8 +19623,17 @@
+@@ -19526,8 +19651,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -21812,7 +12057,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17530,14 +19651,19 @@
+@@ -19545,14 +19679,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -21834,7 +12079,7 @@
    esac
    ;;
  
-@@ -17557,9 +19683,9 @@
+@@ -19572,9 +19711,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -21846,7 +12091,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17574,7 +19700,7 @@
+@@ -19589,7 +19728,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -21855,7 +12100,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17585,7 +19711,7 @@
+@@ -19600,7 +19739,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -21864,7 +12109,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17597,6 +19723,18 @@
+@@ -19612,6 +19751,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -21883,7 +12128,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17647,22 +19785,19 @@
+@@ -19662,22 +19813,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -21912,7 +12157,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,
-@@ -17672,6 +19807,30 @@
+@@ -19687,6 +19835,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -21943,7 +12188,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17681,7 +19840,7 @@
+@@ -19696,7 +19868,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -21952,7 +12197,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17709,8 +19868,13 @@
+@@ -19724,8 +19896,13 @@
  
  openbsd*)
    version_type=sunos
@@ -21967,7 +12212,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
-@@ -17730,7 +19894,7 @@
+@@ -19745,7 +19922,7 @@
  
  os2*)
    libname_spec='$name'
@@ -21976,7 +12221,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17748,13 +19912,6 @@
+@@ -19763,13 +19940,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -21990,7 +12235,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17780,7 +19937,7 @@
+@@ -19795,7 +19965,7 @@
    need_version=yes
    ;;
  
@@ -21999,7 +12244,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'
-@@ -17813,6 +19970,29 @@
+@@ -19828,6 +19998,29 @@
    fi
    ;;
  
@@ -22029,25 +12274,17 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17824,16 +20004,21 @@
-   dynamic_linker=no
-   ;;
- esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
+@@ -19843,12 +20036,17 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
-+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+ echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
 -   test -n "$runpath_var F77" || \
@@ -22057,46 +12294,35 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17853,8 +20038,8 @@
-   # directories.
-   hardcode_action_F77=unsupported
- fi
--echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--echo "${ECHO_T}$hardcode_action_F77" >&6
-+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+echo "${ECHO_T}$hardcode_action_F77" >&6; }
- 
- if test "$hardcode_action_F77" = relink; then
-   # Fast installation is not supported
-@@ -17865,36 +20050,6 @@
+@@ -19880,36 +20078,6 @@
    enable_fast_install=needless
  fi
  
 -striplib=
 -old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
 -  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
 -  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -else
 -# FIXME - insert some real tests, host_os isn't really good enough
 -  case $host_os in
 -   darwin*)
 -       if test -n "$STRIP" ; then
 -         striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-         { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -fi
 -       ;;
 -   *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -    ;;
 -  esac
 -fi
@@ -22105,7 +12331,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17909,7 +20064,8 @@
+@@ -19924,7 +20092,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.
@@ -22115,7 +12341,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 \
-@@ -18009,6 +20165,12 @@
+@@ -20024,6 +20193,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22128,7 +12354,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18020,6 +20182,9 @@
+@@ -20035,6 +20210,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22138,7 +12364,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18039,7 +20204,7 @@
+@@ -20054,7 +20232,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22147,7 +12373,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18070,7 +20235,7 @@
+@@ -20085,7 +20263,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22156,7 +12382,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18085,7 +20250,7 @@
+@@ -20100,7 +20278,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -22165,7 +12391,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18287,7 +20452,10 @@
+@@ -20302,7 +20480,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.
@@ -22177,15 +12403,7 @@
  fi
  
  
-@@ -18308,7 +20476,6 @@
- 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- 
- 
--
- # Source file extension for Java test sources.
- ac_ext=java
- 
-@@ -18320,26 +20487,55 @@
+@@ -20334,26 +20515,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -22242,18 +12460,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
-@@ -18351,8 +20547,8 @@
-   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18366,26 +20562,28 @@
+@@ -20380,18 +20590,20 @@
     # 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 \
@@ -22261,13 +12468,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18372: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20568: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:20386: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20596: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18376: \$? = $ac_status" >&5
-+   echo "$as_me:20572: \$? = $ac_status" >&5
+-   echo "$as_me:20390: \$? = $ac_status" >&5
++   echo "$as_me:20600: \$? = $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
@@ -22279,28 +12486,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-    $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-     lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18399,8 +20597,8 @@
- lt_prog_compiler_pic_GCJ=
- lt_prog_compiler_static_GCJ=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18438,6 +20636,11 @@
+@@ -20452,6 +20664,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -22312,7 +12498,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18454,7 +20657,7 @@
+@@ -20468,7 +20685,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -22321,7 +12507,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18480,6 +20683,16 @@
+@@ -20494,6 +20711,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -22338,7 +12524,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18491,7 +20704,7 @@
+@@ -20505,7 +20732,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.
@@ -22347,7 +12533,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18515,12 +20728,19 @@
+@@ -20529,12 +20756,19 @@
        ;;
  
      linux*)
@@ -22368,7 +12554,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18535,15 +20755,15 @@
+@@ -20549,15 +20783,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -22390,7 +12576,7 @@
        ;;
  
      sunos4*)
-@@ -18552,7 +20772,7 @@
+@@ -20566,7 +20800,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -22399,7 +12585,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18565,6 +20785,17 @@
+@@ -20579,6 +20813,17 @@
        fi
        ;;
  
@@ -22417,28 +12603,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18576,16 +20807,16 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
- 
- #
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18599,26 +20830,28 @@
+@@ -20613,18 +20858,20 @@
     # 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 \
@@ -22446,13 +12611,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18605: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20836: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:20619: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20864: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18609: \$? = $ac_status" >&5
-+   echo "$as_me:20840: \$? = $ac_status" >&5
+-   echo "$as_me:20623: \$? = $ac_status" >&5
++   echo "$as_me:20868: \$? = $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
@@ -22464,31 +12629,19 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-    $rm conftest*
- 
+@@ -20645,7 +20892,7 @@
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
  
- if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-     case $lt_prog_compiler_pic_GCJ in
-@@ -18631,7 +20864,7 @@
  fi
- 
- fi
 -case "$host_os" in
 +case $host_os in
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18641,8 +20874,50 @@
+@@ -20655,6 +20902,48 @@
      ;;
  esac
  
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -22531,12 +12684,10 @@
 +fi
 +
 +
-+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+ echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18653,60 +20928,58 @@
+@@ -20667,38 +20956,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -22557,13 +12708,13 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18672: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20940: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:20686: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20968: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18676: \$? = $ac_status" >&5
-+   echo "$as_me:20944: \$? = $ac_status" >&5
+-   echo "$as_me:20690: \$? = $ac_status" >&5
++   echo "$as_me:20972: \$? = $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
@@ -22587,46 +12738,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
- 
- 
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-   hard_links=yes
-   $rm conftest*
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
-+  { echo "$as_me:$LINENO: result: $hard_links" >&5
-+echo "${ECHO_T}$hard_links" >&6; }
-   if test "$hard_links" = no; then
-     { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18716,8 +20989,8 @@
-   need_locks=no
- fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
- 
-   runpath_var=
-   allow_undefined_flag_GCJ=
-@@ -18755,6 +21028,16 @@
+@@ -20769,6 +21056,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -22643,7 +12755,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18765,6 +21048,10 @@
+@@ -20779,6 +21076,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -22654,7 +12766,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18775,6 +21062,27 @@
+@@ -20789,6 +21090,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -22682,7 +12794,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18812,7 +21120,7 @@
+@@ -20826,7 +21148,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -22691,7 +12803,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18822,13 +21130,13 @@
+@@ -20836,13 +21158,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'
@@ -22708,7 +12820,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
-@@ -18837,23 +21145,70 @@
+@@ -20851,23 +21173,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -22785,7 +12897,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18867,13 +21222,40 @@
+@@ -20881,13 +21250,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22828,7 +12940,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18883,24 +21265,19 @@
+@@ -20897,24 +21293,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22860,7 +12972,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18912,7 +21289,7 @@
+@@ -20926,7 +21317,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -22869,7 +12981,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18934,9 +21311,21 @@
+@@ -20948,9 +21339,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
@@ -22893,7 +13005,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18953,7 +21342,7 @@
+@@ -20967,7 +21370,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -22902,7 +13014,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`
-@@ -18972,8 +21361,12 @@
+@@ -20986,8 +21389,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -22915,7 +13027,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -18981,22 +21374,23 @@
+@@ -20995,22 +21402,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -22946,58 +13058,12 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19012,23 +21406,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19042,19 +21449,20 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -21072,18 +21480,17 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -23015,61 +13081,16 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19073,23 +21481,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19103,7 +21524,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -21148,7 +21555,7 @@
  
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19113,13 +21536,11 @@
+ 
+@@ -21157,13 +21564,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23086,7 +13107,7 @@
  	fi
        fi
        ;;
-@@ -19132,7 +21553,7 @@
+@@ -21176,7 +21581,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -23095,7 +13116,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19142,68 +21563,68 @@
+@@ -21186,68 +21591,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -23208,7 +13229,7 @@
      fi
        ;;
  
-@@ -19237,16 +21658,25 @@
+@@ -21281,16 +21686,25 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23237,7 +13258,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
-@@ -19260,47 +21690,62 @@
+@@ -21304,47 +21718,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -23324,7 +13345,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19314,7 +21759,7 @@
+@@ -21358,7 +21787,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -23333,7 +13354,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'
-@@ -19324,7 +21769,7 @@
+@@ -21368,7 +21797,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -23342,7 +13363,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
-@@ -19347,7 +21792,8 @@
+@@ -21391,7 +21820,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
@@ -23352,7 +13373,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19357,7 +21803,7 @@
+@@ -21401,7 +21831,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -23361,7 +13382,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19368,14 +21814,14 @@
+@@ -21412,14 +21842,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -23378,7 +13399,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'
-@@ -19387,13 +21833,13 @@
+@@ -21431,13 +21861,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23394,7 +13415,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19401,21 +21847,15 @@
+@@ -21445,21 +21875,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -23420,7 +13441,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'
-@@ -19424,8 +21864,18 @@
+@@ -21468,8 +21892,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23441,7 +13462,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19434,7 +21884,7 @@
+@@ -21478,7 +21912,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.
@@ -23450,7 +13471,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19482,36 +21932,45 @@
+@@ -21526,36 +21960,45 @@
        fi
        ;;
  
@@ -23517,14 +13538,8 @@
        ;;
  
      uts4*)
-@@ -19526,15 +21985,10 @@
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+@@ -21574,11 +22017,6 @@
+ echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -23535,18 +13550,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19552,8 +22006,8 @@
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-       $rm conftest*
-       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-@@ -19567,6 +22021,7 @@
+@@ -21611,6 +22049,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -23554,24 +13558,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19589,20 +22044,20 @@
-         cat conftest.err 1>&5
-       fi
-       $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-+      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-       ;;
-     esac
-   fi
-   ;;
- esac
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
+@@ -21646,7 +22085,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -23580,7 +13567,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19612,7 +22067,20 @@
+@@ -21656,7 +22095,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23602,7 +13589,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19677,7 +22145,7 @@
+@@ -21721,7 +22173,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23611,7 +13598,7 @@
    ;;
  
  beos*)
-@@ -19686,7 +22154,7 @@
+@@ -21730,7 +22182,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -23620,7 +13607,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19702,7 +22170,7 @@
+@@ -21746,7 +22198,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -23629,7 +13616,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19714,7 +22182,8 @@
+@@ -21758,7 +22210,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -23639,7 +13626,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19744,7 +22213,7 @@
+@@ -21788,7 +22241,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23648,7 +13635,7 @@
        ;;
      esac
      ;;
-@@ -19767,7 +22236,7 @@
+@@ -21811,7 +22264,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -23657,7 +13644,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"`
-@@ -19790,7 +22259,7 @@
+@@ -21834,7 +22287,7 @@
    dynamic_linker=no
    ;;
  
@@ -23666,7 +13653,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19802,8 +22271,17 @@
+@@ -21846,8 +22299,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -23686,7 +13673,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19821,14 +22299,19 @@
+@@ -21865,14 +22327,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -23708,7 +13695,7 @@
    esac
    ;;
  
-@@ -19848,9 +22331,9 @@
+@@ -21892,9 +22359,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -23720,7 +13707,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19865,7 +22348,7 @@
+@@ -21909,7 +22376,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -23729,7 +13716,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19876,7 +22359,7 @@
+@@ -21920,7 +22387,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -23738,7 +13725,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19888,6 +22371,18 @@
+@@ -21932,6 +22399,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -23757,10 +13744,15 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -19938,22 +22433,19 @@
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+@@ -21977,1141 +22456,274 @@
+ # This must be Linux ELF.
+ linux*)
+   version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
@@ -23768,92 +13760,100 @@
 -      libsuff=64
 -    fi
 -  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
 -  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
 -  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
-+
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-   # powerpc, because MkLinux only supported shared libraries with the
-   # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -19963,6 +22455,30 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -19972,7 +22488,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
+-
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
+-
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-@@ -20000,8 +22516,13 @@
- 
- openbsd*)
-   version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-   need_lib_prefix=no
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
+-
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
+-
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
 -  need_version=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -20021,7 +22542,7 @@
- 
- os2*)
-   libname_spec='$name'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
+-
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
 -  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -20039,13 +22560,6 @@
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   ;;
- 
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
+-
 -sco3.2v5*)
 -  version_type=osf
 -  soname_spec='${libname}${release}${shared_ext}$major'
@@ -23861,61 +13861,81 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
 -
- solaris*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -20071,7 +22585,7 @@
-   need_version=yes
-   ;;
- 
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
+-
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
+-
 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+sysv4 | sysv4.3*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-@@ -20104,6 +22618,29 @@
-   fi
-   ;;
- 
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+    shlibpath_overrides_runpath=no
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    shlibpath_overrides_runpath=yes
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
- uts4*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -20112,876 +22649,53 @@
-   ;;
- 
- *)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
+-
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
+-
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-*)
 -  dynamic_linker=no
 -  ;;
 -esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
+-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6; }
 -test "$dynamic_linker" = no && can_build_shared=no
 -
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 -hardcode_action_GCJ=
 -if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 -   test -n "$runpath_var GCJ" || \
@@ -23939,8 +13959,8 @@
 -  # directories.
 -  hardcode_action_GCJ=unsupported
 -fi
--echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6
+-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
 -
 -if test "$hardcode_action_GCJ" = relink; then
 -  # Fast installation is not supported
@@ -23953,29 +13973,29 @@
 -
 -striplib=
 -old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
 -  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
 -  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -else
 -# FIXME - insert some real tests, host_os isn't really good enough
 -  case $host_os in
 -   darwin*)
 -       if test -n "$STRIP" ; then
 -         striplib="$STRIP -x"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-         { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
 -       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -fi
 -       ;;
 -   *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
 -    ;;
 -  esac
 -fi
@@ -24007,8 +14027,8 @@
 -
 -  darwin*)
 -  # if libdl is installed we need to link against it
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24021,39 +14041,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -24062,14 +14095,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 core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
@@ -24083,8 +14117,8 @@
 -   ;;
 -
 -  *)
--    echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking for shl_load" >&5
+-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 -if test "${ac_cv_func_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24111,52 +14145,59 @@
 -
 -#undef shl_load
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shl_load) || defined (__stub___shl_load)
+-#if defined __stub_shl_load || defined __stub___shl_load
 -choke me
--#else
--char (*f) () = shl_load;
 -#endif
--#ifdef __cplusplus
--}
--#endif
 -
 -int
 -main ()
 -{
--return f != shl_load;
+-return shl_load ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -24165,18 +14206,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 core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
 -if test $ac_cv_func_shl_load = yes; then
 -  lt_cv_dlopen="shl_load"
 -else
--  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dld_shl_load+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24189,39 +14231,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char shl_load ();
 -int
 -main ()
 -{
--shl_load ();
+-return shl_load ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -24230,19 +14285,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 core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 -if test $ac_cv_lib_dld_shl_load = yes; then
 -  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 -else
--  echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dlopen" >&5
+-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 -if test "${ac_cv_func_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24269,52 +14325,59 @@
 -
 -#undef dlopen
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
+-#if defined __stub_dlopen || defined __stub___dlopen
 -choke me
--#else
--char (*f) () = dlopen;
 -#endif
--#ifdef __cplusplus
--}
--#endif
 -
 -int
 -main ()
 -{
--return f != dlopen;
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -24323,18 +14386,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 core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
 -if test $ac_cv_func_dlopen = yes; then
 -  lt_cv_dlopen="dlopen"
 -else
--  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24347,39 +14411,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -24388,19 +14465,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 core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
--  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_svld_dlopen+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24413,39 +14491,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dlopen ();
 -int
 -main ()
 -{
--dlopen ();
+-return dlopen ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -24454,19 +14545,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 core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 -if test $ac_cv_lib_svld_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 -else
--  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
+-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_dld_dld_link+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24479,39 +14571,52 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any gcc2 internal prototype to avoid an error.  */
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char dld_link ();
 -int
 -main ()
 -{
--dld_link ();
+-return dld_link ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (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
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
@@ -24520,14 +14625,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 core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
+-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
@@ -24567,8 +14673,8 @@
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
 -
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 -if test "${lt_cv_dlopen_self+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24578,7 +14684,7 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20786 "configure"
+-#line 22916 "configure"
 -#include "confdefs.h"
 -
 -#if HAVE_DLFCN_H
@@ -24596,7 +14702,18 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -24618,24 +14735,59 @@
 -#    endif
 -#  endif
 -#endif
--
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
+ 
 -    exit (status);
 -}
 -EOF
@@ -24654,19 +14806,41 @@
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
--  fi
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
+   fi
 -fi
 -rm -fr conftest*
 -
--
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
 -fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 -if test "${lt_cv_dlopen_self_static+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
@@ -24676,15 +14850,57 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 20884 "configure"
+-#line 23014 "configure"
 -#include "confdefs.h"
--
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
--
++openbsd*)
++  version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
++  need_lib_prefix=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
+ 
 -#include <stdio.h>
--
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -24694,7 +14910,17 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -24716,24 +14942,78 @@
 -#    endif
 -#  endif
 -#endif
--
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
++sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
 -    exit (status);
 -}
 -EOF
@@ -24748,14 +15028,42 @@
 -      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
 -      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
 -      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
--    esac
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
+     esac
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self_static=no
--  fi
+   fi
 -fi
 -rm -fr conftest*
--
++  sys_lib_dlsearch_path_spec='/usr/lib'
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
++*)
 +  dynamic_linker=no
 +  ;;
 +esac
@@ -24767,8 +15075,8 @@
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
 -    fi
  
 -    CPPFLAGS="$save_CPPFLAGS"
@@ -24822,7 +15130,7 @@
  fi
  
  
-@@ -20998,7 +22712,8 @@
+@@ -23128,7 +22740,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.
@@ -24832,7 +15140,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 \
-@@ -21098,6 +22813,12 @@
+@@ -23228,6 +22841,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -24845,7 +15153,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21109,6 +22830,9 @@
+@@ -23239,6 +22858,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -24855,7 +15163,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21128,7 +22852,7 @@
+@@ -23258,7 +22880,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -24864,7 +15172,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21159,7 +22883,7 @@
+@@ -23289,7 +22911,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -24873,7 +15181,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21174,7 +22898,7 @@
+@@ -23304,7 +22926,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -24882,7 +15190,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21376,7 +23100,10 @@
+@@ -23506,7 +23128,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.
@@ -24894,15 +15202,7 @@
  fi
  
  
-@@ -21396,7 +23123,6 @@
-       RC)
- 
- 
--
- # Source file extension for RC test sources.
- ac_ext=rc
- 
-@@ -21415,15 +23141,42 @@
+@@ -23544,15 +23169,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -24945,7 +15245,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21439,7 +23192,8 @@
+@@ -23568,7 +23220,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.
@@ -24955,7 +15255,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 \
-@@ -21539,6 +23293,12 @@
+@@ -23668,6 +23321,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -24968,7 +15268,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21550,6 +23310,9 @@
+@@ -23679,6 +23338,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -24978,7 +15278,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21569,7 +23332,7 @@
+@@ -23698,7 +23360,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -24987,7 +15287,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21600,7 +23363,7 @@
+@@ -23729,7 +23391,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -24996,7 +15296,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21615,7 +23378,7 @@
+@@ -23744,7 +23406,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -25005,7 +15305,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21817,7 +23580,10 @@
+@@ -23946,7 +23608,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.
@@ -25017,7 +15317,7 @@
  fi
  
  
-@@ -21864,7 +23630,7 @@
+@@ -23993,7 +23658,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -25026,226 +15326,7 @@
  
  # Prevent multiple expansion
  
-@@ -21919,8 +23685,8 @@
- 
-     # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_MSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21946,17 +23712,17 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test -n "$MSGFMT"; then
--  echo "$as_me:$LINENO: result: $MSGFMT" >&5
--echo "${ECHO_T}$MSGFMT" >&6
-+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+echo "${ECHO_T}$MSGFMT" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-     # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_GMSGFMT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -21971,32 +23737,33 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-   ;;
- esac
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
--
- if test -n "$GMSGFMT"; then
--  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
--echo "${ECHO_T}$GMSGFMT" >&6
-+  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+echo "${ECHO_T}$GMSGFMT" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-+
-      if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
--        echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
--echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-+        { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; }
-         GMSGFMT=":"
-       fi
-       MSGFMT=$GMSGFMT
-@@ -22005,8 +23772,8 @@
- 
-       # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_XGETTEXT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22032,11 +23799,11 @@
- fi
- XGETTEXT="$ac_cv_path_XGETTEXT"
- if test -n "$XGETTEXT"; then
--  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
--echo "${ECHO_T}$XGETTEXT" >&6
-+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+echo "${ECHO_T}$XGETTEXT" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- 
-@@ -22044,8 +23811,8 @@
- 			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- 	  : ;
- 	else
--	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
--echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
-+	  { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-+echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; }
- 	  XGETTEXT=":"
- 	fi
-       fi
-@@ -22139,8 +23906,7 @@
- 
- 
- 
--
--     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22152,8 +23918,8 @@
-     ac_save_CXXFLAGS="$CXXFLAGS"
-     CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
- 
--    echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
--echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
-+echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; }
-     if test "${kde_cv_stl_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22181,23 +23947,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22206,15 +23985,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
- 
- fi
- 
- 
--   echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
--echo "${ECHO_T}$kde_cv_stl_works" >&6
-+   { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
-+echo "${ECHO_T}$kde_cv_stl_works" >&6; }
- 
-    if test "$kde_cv_stl_works" = "yes"; then
-      # back compatible
-@@ -22243,15 +24023,14 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for strlcat" >&5
--echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for strlcat" >&5
-+echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; }
- if test "${kde_cv_func_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22263,9 +24042,6 @@
+@@ -24405,9 +24070,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25255,174 +15336,16 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22291,23 +24067,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22316,8 +24105,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24593,7 +24255,7 @@
  
--kde_cv_func_strlcat=no
-+	kde_cv_func_strlcat=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
-@@ -22331,11 +24121,11 @@
- fi
  
- 
--echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
--echo "${ECHO_T}$kde_cv_func_strlcat" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5
-+echo "${ECHO_T}$kde_cv_func_strlcat" >&6; }
- 
--echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
--echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
-+echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; }
- if test "${kde_cv_proto_strlcat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22356,8 +24146,7 @@
- if test "x$kde_cv_proto_strlcat" = xunknown; then
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22395,23 +24184,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22421,9 +24223,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_proto_strlcat="strlcat unavailable"
-+	kde_cv_proto_strlcat="strlcat unavailable"
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -22437,8 +24240,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
--echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
-+echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; }
- 
- if test "x$kde_cv_func_strlcat" = xyes; then
- 
-@@ -22462,15 +24265,14 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for strlcpy" >&5
--echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for strlcpy" >&5
-+echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; }
- if test "${kde_cv_func_strlcpy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22482,9 +24284,6 @@
+ ac_ext=c
+@@ -24650,9 +24312,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25432,2429 +15355,160 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22509,23 +24308,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22534,8 +24346,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -24836,7 +24495,7 @@
  
--kde_cv_func_strlcpy=no
-+	kde_cv_func_strlcpy=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
-@@ -22549,11 +24362,11 @@
- fi
  
- 
--echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
--echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5
-+echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; }
- 
--echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
--echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
-+echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; }
- if test "${kde_cv_proto_strlcpy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22574,8 +24387,7 @@
- if test "x$kde_cv_proto_strlcpy" = xunknown; then
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22612,23 +24424,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22638,9 +24463,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_proto_strlcpy="strlcpy unavailable"
-+	kde_cv_proto_strlcpy="strlcpy unavailable"
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -22654,8 +24480,8 @@
- 
+ ac_ext=c
+@@ -24938,7 +24597,7 @@
+ 	ac_cv_lib_util_main=no
  fi
  
--echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
--echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
-+echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
- 
- if test "x$kde_cv_func_strlcpy" = xyes; then
- 
-@@ -22678,8 +24504,8 @@
- 
- 
- 
--      echo "$as_me:$LINENO: checking for main in -lutil" >&5
--echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for main in -lutil" >&5
-+echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; }
- if test "${ac_cv_lib_util_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22696,29 +24522,42 @@
- int
- main ()
- {
--main ();
-+return main ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22727,20 +24566,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
--echo "${ECHO_T}$ac_cv_lib_util_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
- if test $ac_cv_lib_util_main = yes; then
-   LIBUTIL="-lutil"
+@@ -25013,7 +24672,7 @@
+ 	ac_cv_lib_compat_main=no
  fi
  
--   echo "$as_me:$LINENO: checking for main in -lcompat" >&5
--echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-+echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; }
- if test "${ac_cv_lib_compat_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22757,29 +24597,42 @@
- int
- main ()
- {
--main ();
-+return main ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22788,21 +24641,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
--echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
- if test $ac_cv_lib_compat_main = yes; then
-   LIBCOMPAT="-lcompat"
+@@ -25095,7 +24754,7 @@
+ 	ac_cv_lib_crypt_crypt=no
  fi
  
-    kde_have_crypt=
--   echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
--echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22815,39 +24669,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char crypt ();
- int
- main ()
- {
--crypt ();
-+return crypt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22856,19 +24723,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
--echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
- if test $ac_cv_lib_crypt_crypt = yes; then
-   LIBCRYPT="-lcrypt"; kde_have_crypt=yes
- else
--  echo "$as_me:$LINENO: checking for crypt in -lc" >&5
--echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for crypt in -lc" >&5
-+echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_c_crypt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -22881,39 +24749,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char crypt ();
- int
- main ()
- {
--crypt ();
-+return crypt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22922,14 +24803,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
+@@ -25175,7 +24834,7 @@
+ 	ac_cv_lib_c_crypt=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
--echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; }
- if test $ac_cv_lib_c_crypt = yes; then
-   kde_have_crypt=yes
- else
-@@ -22955,13 +24837,13 @@
- 
-    fi
- 
--   echo "$as_me:$LINENO: checking for socklen_t" >&5
--echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for socklen_t" >&5
-+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
-    if test "${kde_cv_socklen_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--      ac_ext=cc
-+      ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22990,23 +24872,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23018,7 +24913,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
+@@ -25474,7 +25133,7 @@
+ 	ac_cv_lib_dnet_dnet_ntoa=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-       ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -23029,17 +24926,17 @@
  
- fi
- 
--   echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
--echo "${ECHO_T}$kde_cv_socklen_t" >&6
-+   { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5
-+echo "${ECHO_T}$kde_cv_socklen_t" >&6; }
-    if test $kde_cv_socklen_t = no; then
--      echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
--echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5
-+echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; }
-       if test "${kde_cv_socklen_t_equiv+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-          kde_cv_socklen_t_equiv=int
--         ac_ext=cc
-+         ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23068,23 +24965,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23096,7 +25006,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-          done
-          ac_ext=c
-@@ -23108,8 +25020,8 @@
- 
- fi
- 
--      echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
--echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5
-+echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; }
-    fi
- 
- cat >>confdefs.h <<_ACEOF
-@@ -23122,8 +25034,8 @@
- _ACEOF
- 
- 
--   echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23136,39 +25048,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23177,21 +25102,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+@@ -25556,7 +25215,7 @@
+ 	ac_cv_lib_dnet_stub_dnet_ntoa=no
  fi
  
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
--      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
--echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23204,39 +25130,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dnet_ntoa ();
- int
- main ()
- {
--dnet_ntoa ();
-+return dnet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23245,21 +25184,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
- if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -25659,7 +25318,7 @@
+ 	ac_cv_func_inet_ntoa=no
  fi
  
-    fi
--   echo "$as_me:$LINENO: checking for inet_ntoa" >&5
--echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for inet_ntoa" >&5
-+echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; }
- if test "${ac_cv_func_inet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23286,52 +25226,59 @@
- 
- #undef inet_ntoa
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char inet_ntoa ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa)
-+#if defined __stub_inet_ntoa || defined __stub___inet_ntoa
- choke me
--#else
--char (*f) () = inet_ntoa;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != inet_ntoa;
-+return inet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23340,17 +25287,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; }
- 
-    if test $ac_cv_func_inet_ntoa = no; then
--     echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
--echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
-+     { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
-+echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23363,39 +25311,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char inet_ntoa ();
- int
- main ()
- {
--inet_ntoa ();
-+return inet_ntoa ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23404,21 +25365,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
+ { echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
+@@ -25737,7 +25396,7 @@
+ 	ac_cv_lib_nsl_inet_ntoa=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
- if test $ac_cv_lib_nsl_inet_ntoa = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+@@ -25840,7 +25499,7 @@
+ 	ac_cv_func_connect=no
  fi
  
-    fi
--   echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23445,52 +25407,59 @@
- 
- #undef connect
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_connect) || defined (__stub___connect)
-+#if defined __stub_connect || defined __stub___connect
- choke me
--#else
--char (*f) () = connect;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != connect;
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23499,17 +25468,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
--echo "${ECHO_T}$ac_cv_func_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
- 
-    if test $ac_cv_func_connect = no; then
--      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23522,39 +25492,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23563,22 +25546,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
+ { echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+@@ -25918,7 +25577,7 @@
+ 	ac_cv_lib_socket_connect=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
-   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -26022,7 +25681,7 @@
+ 	ac_cv_func_remove=no
  fi
  
-    fi
- 
--   echo "$as_me:$LINENO: checking for remove" >&5
--echo $ECHO_N "checking for remove... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
- if test "${ac_cv_func_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23605,52 +25589,59 @@
- 
- #undef remove
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char remove ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_remove) || defined (__stub___remove)
-+#if defined __stub_remove || defined __stub___remove
- choke me
--#else
--char (*f) () = remove;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != remove;
-+return remove ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23659,17 +25650,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
--echo "${ECHO_T}$ac_cv_func_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
- 
-    if test $ac_cv_func_remove = no; then
--      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
--echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
- if test "${ac_cv_lib_posix_remove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23682,39 +25674,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char remove ();
- int
- main ()
- {
--remove ();
-+return remove ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23723,14 +25728,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
+ { echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+@@ -26100,7 +25759,7 @@
+ 	ac_cv_lib_posix_remove=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
--echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
- if test $ac_cv_lib_posix_remove = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -26205,7 +25864,7 @@
+ 	ac_cv_func_shmat=no
  fi
-@@ -23738,8 +25744,8 @@
-    fi
  
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
--   echo "$as_me:$LINENO: checking for shmat" >&5
--echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
- if test "${ac_cv_func_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23766,52 +25772,59 @@
- 
- #undef shmat
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shmat ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shmat) || defined (__stub___shmat)
-+#if defined __stub_shmat || defined __stub___shmat
- choke me
--#else
--char (*f) () = shmat;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != shmat;
-+return shmat ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23820,18 +25833,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
--echo "${ECHO_T}$ac_cv_func_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
- if test $ac_cv_func_shmat = yes; then
-   :
- else
--  echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
--echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -23844,39 +25858,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shmat ();
- int
- main ()
- {
--shmat ();
-+return shmat ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23885,14 +25912,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
+ { echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+@@ -26284,7 +25943,7 @@
+ 	ac_cv_lib_ipc_shmat=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
--echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
- if test $ac_cv_lib_ipc_shmat = yes; then
-   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -26702,7 +26361,7 @@
+ 	ac_cv_lib_poll_poll=no
  fi
-@@ -23906,18 +25934,19 @@
- for ac_header in sys/types.h stdint.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23928,23 +25957,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23953,15 +25995,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23970,8 +26013,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -23995,9 +26043,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24021,25 +26070,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24057,18 +26100,19 @@
- for ac_header in sys/bitypes.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24079,23 +26123,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24104,15 +26161,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24121,8 +26179,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -24146,9 +26209,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24172,25 +26236,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24204,8 +26262,8 @@
- 
- 
-    # darwin requires a poll emulation library
--   echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
--echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
-+echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; }
- if test "${ac_cv_lib_poll_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24218,39 +26276,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char poll ();
- int
- main ()
- {
--poll ();
-+return poll ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24259,14 +26330,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
--echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-+echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; }
- if test $ac_cv_lib_poll_poll = yes; then
-   LIB_POLL="-lpoll"
- fi
-@@ -24277,18 +26349,19 @@
- for ac_header in Carbon/Carbon.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24299,23 +26372,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24324,15 +26410,16 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27122,7 +26781,7 @@
  
--ac_header_compiler=no
-+	ac_header_compiler=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
  
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24341,8 +26428,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -24366,9 +26458,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24392,25 +26485,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24425,17 +26512,17 @@
- 
-    # CoreAudio framework
-    if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
--echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
--echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
--echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-+echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24446,23 +26533,36 @@
- #include <CoreAudio/CoreAudio.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24471,15 +26571,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
--echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-+echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -24488,8 +26589,13 @@
- /* end confdefs.h.  */
- #include <CoreAudio/CoreAudio.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -24513,9 +26619,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24539,25 +26646,18 @@
- echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
--echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
--echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
- 
- fi
- if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24574,8 +26674,8 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
--echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-+echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; }
-   kde_libs_safe="$LIBS"
-   LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -24601,30 +26701,43 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-       LIBRESOLV="-lresolv"
--      echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+      { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_RES_INIT 1
-@@ -24635,25 +26748,25 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	 { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    LIBS=$kde_libs_safe
  
- 
- 
--echo "$as_me:$LINENO: checking for res_init" >&5
--echo $ECHO_N "checking for res_init... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for res_init" >&5
-+echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
- if test "${kde_cv_func_res_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24665,9 +26778,6 @@
+@@ -27147,9 +26806,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27864,8430 +15518,1097 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24693,23 +26803,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24718,8 +26841,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -27335,7 +26991,7 @@
  
--kde_cv_func_res_init=no
-+	kde_cv_func_res_init=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$save_CXXFLAGS"
- LIBS="$kde_safe_LIBS"
-@@ -24733,11 +26857,11 @@
- fi
  
- 
--echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
--echo "${ECHO_T}$kde_cv_func_res_init" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5
-+echo "${ECHO_T}$kde_cv_func_res_init" >&6; }
- 
--echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
--echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5
-+echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; }
- if test "${kde_cv_proto_res_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24758,8 +26882,7 @@
- if test "x$kde_cv_proto_res_init" = xunknown; then
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24797,23 +26920,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24823,9 +26959,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_proto_res_init="res_init unavailable"
-+	kde_cv_proto_res_init="res_init unavailable"
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -24839,8 +26976,8 @@
- 
+ ac_ext=c
+@@ -27447,7 +27103,7 @@
+ 	ac_cv_lib_ucb_killpg=no
  fi
  
--echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
--echo "${ECHO_T}$kde_cv_proto_res_init" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
-+echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
- 
- if test "x$kde_cv_func_res_init" = xyes; then
- 
-@@ -24867,8 +27004,8 @@
-    LIBSOCKET="$X_EXTRA_LIBS"
- 
- 
--   echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
--echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
-+echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24881,39 +27018,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char killpg ();
- int
- main ()
- {
--killpg ();
-+return killpg ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24922,27 +27072,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
--echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-+echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
- if test $ac_cv_lib_ucb_killpg = yes; then
-   LIBUCB="-lucb"
+@@ -27535,7 +27191,7 @@
+ 	ac_cv_lib_bsd_gethostbyname=no
  fi
  
- 
-    case $host in     *-*-lynxos* )
--        echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
--echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
-+echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; }
-         CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
--        echo "$as_me:$LINENO: result: disabled" >&5
--echo "${ECHO_T}disabled" >&6
--        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
--echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6; }
-+        { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -24955,39 +27106,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24996,22 +27160,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
- if test $ac_cv_lib_bsd_gethostbyname = yes; then
-   LIBSOCKET="-lbsd"
- fi
-           ;;
-     esac
+@@ -27618,16 +27274,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+ echo "${ECHO_T}$ac_cv_type_int" >&6; }
  
--     echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6
-+     { echo "$as_me:$LINENO: checking for int" >&5
-+echo $ECHO_N "checking for int... $ECHO_C" >&6; }
- if test "${ac_cv_type_int+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25022,35 +27187,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef int ac__type_new_;
- int
- main ()
- {
--if ((int *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (int))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25059,20 +27238,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
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-+echo "${ECHO_T}$ac_cv_type_int" >&6; }
- 
--echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking size of int" >&5
-+echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of int" >&5
+ echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$ac_cv_type_int" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -25085,10 +27265,11 @@
+-  if test "$ac_cv_type_int" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -27637,7 +27292,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
+-		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25096,23 +27277,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25125,10 +27319,11 @@
+@@ -27691,7 +27347,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
+-		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25136,23 +27331,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25161,30 +27369,32 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -27762,7 +27419,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
+-		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25192,23 +27402,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25221,10 +27444,11 @@
+@@ -27816,7 +27474,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
+-		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25232,23 +27456,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25257,23 +27494,26 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25285,10 +27525,11 @@
+@@ -27897,7 +27556,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef int ac__type_sizeof_;
+-		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25296,23 +27537,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25321,24 +27575,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
+@@ -27954,11 +27614,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++'') if test "$ac_cv_type_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
+ echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_int=0
++	       fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25346,8 +27596,9 @@
+@@ -27968,7 +27632,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (int)); }
--unsigned long ulongval () { return (long) (sizeof (int)); }
-+		   typedef int ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef int ac__type_sizeof_;
++	        typedef int ac__type_sizeof_;
++
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -25356,35 +27607,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (int))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (int))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (int))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25395,28 +27655,27 @@
+@@ -28027,21 +27692,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++if test "$ac_cv_type_int" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int), 77
-+echo "$as_me: error: cannot compute sizeof (int)
+ echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
+    { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_int=0
++	       fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_int=0
+-else
+-  ac_cv_sizeof_int=0
+-fi
  fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
+@@ -28117,16 +27786,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+ echo "${ECHO_T}$ac_cv_type_short" >&6; }
  
--   echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for short" >&5
-+echo $ECHO_N "checking for short... $ECHO_C" >&6; }
- if test "${ac_cv_type_short+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25427,35 +27686,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef short ac__type_new_;
- int
- main ()
- {
--if ((short *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (short))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25464,20 +27737,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
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
-+echo "${ECHO_T}$ac_cv_type_short" >&6; }
- 
--echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking size of short" >&5
-+echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of short" >&5
+ echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$ac_cv_type_short" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -25490,10 +27764,11 @@
+-  if test "$ac_cv_type_short" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -28136,7 +27804,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
+-		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25501,23 +27776,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25530,10 +27818,11 @@
+@@ -28190,7 +27859,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
+-		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25541,23 +27830,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25566,30 +27868,32 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -28261,7 +27931,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
+-		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25597,23 +27901,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25626,10 +27943,11 @@
+@@ -28315,7 +27986,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
+-		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25637,23 +27955,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25662,23 +27993,26 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25690,10 +28024,11 @@
+@@ -28396,7 +28068,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef short ac__type_sizeof_;
+-		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25701,23 +28036,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25726,24 +28074,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
+@@ -28453,11 +28126,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_short=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++'') if test "$ac_cv_type_short" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
+ echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_short=0
++	       fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -25751,8 +28095,9 @@
+@@ -28467,7 +28144,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (short)); }
--unsigned long ulongval () { return (long) (sizeof (short)); }
-+		   typedef short ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef short ac__type_sizeof_;
++	        typedef short ac__type_sizeof_;
++
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -25761,35 +28106,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (short))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (short))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (short))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25800,28 +28154,27 @@
+@@ -28526,21 +28204,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++if test "$ac_cv_type_short" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short), 77
-+echo "$as_me: error: cannot compute sizeof (short)
+ echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
+    { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_short=0
++	       fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_short=0
+-else
+-  ac_cv_sizeof_short=0
+-fi
  fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
+@@ -28616,16 +28298,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long" >&6; }
  
--  echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -25832,35 +28185,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef long ac__type_new_;
- int
- main ()
- {
--if ((long *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (long))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25869,20 +28236,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
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
- 
--echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of long" >&5
+ echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$ac_cv_type_long" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -25895,10 +28263,11 @@
+-  if test "$ac_cv_type_long" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -28635,7 +28316,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
+-		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25906,23 +28275,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25935,10 +28317,11 @@
+@@ -28689,7 +28371,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
+-		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25946,23 +28329,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25971,30 +28367,32 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -28760,7 +28443,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
+-		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26002,23 +28400,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26031,10 +28442,11 @@
+@@ -28814,7 +28498,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
+-		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26042,23 +28454,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26067,23 +28492,26 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26095,10 +28523,11 @@
+@@ -28895,7 +28580,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef long ac__type_sizeof_;
+-		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26106,23 +28535,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26131,24 +28573,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
+@@ -28952,11 +28638,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++'') if test "$ac_cv_type_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
+ echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long=0
++	       fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -26156,8 +28594,9 @@
+@@ -28966,7 +28656,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (long)); }
--unsigned long ulongval () { return (long) (sizeof (long)); }
-+		   typedef long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef long ac__type_sizeof_;
++	        typedef long ac__type_sizeof_;
++
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -26166,35 +28605,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (long))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (long))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (long))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26205,28 +28653,27 @@
+@@ -29025,21 +28716,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++if test "$ac_cv_type_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
+ echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
+    { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_long=0
++	       fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_long=0
+-else
+-  ac_cv_sizeof_long=0
+-fi
  fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
+@@ -29115,16 +28810,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
+ echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
  
--  echo "$as_me:$LINENO: checking for char *" >&5
--echo $ECHO_N "checking for char *... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for char *" >&5
-+echo $ECHO_N "checking for char *... $ECHO_C" >&6; }
- if test "${ac_cv_type_char_p+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26237,35 +28684,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef char * ac__type_new_;
- int
- main ()
- {
--if ((char * *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (char *))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26274,20 +28735,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
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
--echo "${ECHO_T}$ac_cv_type_char_p" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-+echo "${ECHO_T}$ac_cv_type_char_p" >&6; }
- 
--echo "$as_me:$LINENO: checking size of char *" >&5
--echo $ECHO_N "checking size of char *... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking size of char *" >&5
-+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of char *" >&5
+ echo $ECHO_N "checking size of char *... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$ac_cv_type_char_p" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -26300,10 +28762,11 @@
+-  if test "$ac_cv_type_char_p" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -29134,7 +28828,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
+-		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26311,23 +28774,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26340,10 +28816,11 @@
+@@ -29188,7 +28883,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
+-		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26351,23 +28828,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26376,30 +28866,32 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -29259,7 +28955,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
+-		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26407,23 +28899,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26436,10 +28941,11 @@
+@@ -29313,7 +29010,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
+-		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26447,23 +28953,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26472,23 +28991,26 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26500,10 +29022,11 @@
+@@ -29394,7 +29092,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef char * ac__type_sizeof_;
+-		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26511,23 +29034,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26536,24 +29072,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
+@@ -29451,11 +29150,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_char_p=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++'') if test "$ac_cv_type_char_p" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char *), 77
-+echo "$as_me: error: cannot compute sizeof (char *)
+ echo "$as_me: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_char_p=0
++	       fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -26561,8 +29093,9 @@
+@@ -29465,7 +29168,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (char *)); }
--unsigned long ulongval () { return (long) (sizeof (char *)); }
-+		   typedef char * ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef char * ac__type_sizeof_;
++	        typedef char * ac__type_sizeof_;
++
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -26571,35 +29104,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (char *))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (char *))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (char *))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26610,30 +29152,29 @@
+@@ -29524,21 +29228,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++if test "$ac_cv_type_char_p" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char *), 77
-+echo "$as_me: error: cannot compute sizeof (char *)
+ echo "$as_me: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
+    { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_char_p=0
++	       fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_char_p=0
+-else
+-  ac_cv_sizeof_char_p=0
+-fi
  fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
--echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
  _ACEOF
- 
- 
- 
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26646,39 +29187,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26687,14 +29241,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
+@@ -29616,7 +29324,7 @@
+ 	ac_cv_lib_dl_dlopen=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- 
- LIBDL="-ldl"
-@@ -26703,8 +29258,8 @@
+@@ -29701,7 +29409,7 @@
+ 	ac_cv_lib_dld_shl_unload=no
  fi
  
- 
--echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
--echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
-+echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26717,39 +29272,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char shl_unload ();
- int
- main ()
- {
--shl_unload ();
-+return shl_unload ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26758,14 +29326,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
-+echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
- if test $ac_cv_lib_dld_shl_unload = yes; then
+@@ -29791,16 +29499,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
  
- LIBDL="-ldld"
-@@ -26779,8 +29348,8 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for size_t" >&5
-+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26791,35 +29360,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef size_t ac__type_new_;
- int
- main ()
- {
--if ((size_t *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (size_t))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26828,20 +29411,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
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
- 
--echo "$as_me:$LINENO: checking size of size_t" >&5
--echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking size of size_t" >&5
-+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of size_t" >&5
+ echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$ac_cv_type_size_t" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -26854,10 +29438,11 @@
+-  if test "$ac_cv_type_size_t" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -29810,7 +29517,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
+-		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26865,23 +29450,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26894,10 +29492,11 @@
+@@ -29864,7 +29572,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
+-		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26905,23 +29504,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26930,30 +29542,32 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -29935,7 +29644,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
+-		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26961,23 +29575,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26990,10 +29617,11 @@
+@@ -29989,7 +29699,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
+-		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27001,23 +29629,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27026,23 +29667,26 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27054,10 +29698,11 @@
+@@ -30070,7 +29781,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef size_t ac__type_sizeof_;
+-		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27065,23 +29710,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27090,24 +29748,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
+@@ -30127,11 +29839,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_size_t=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++'') if test "$ac_cv_type_size_t" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (size_t), 77
-+echo "$as_me: error: cannot compute sizeof (size_t)
+ echo "$as_me: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_size_t=0
++	       fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27115,8 +29769,9 @@
+@@ -30141,7 +29857,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (size_t)); }
--unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+		   typedef size_t ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef size_t ac__type_sizeof_;
++	        typedef size_t ac__type_sizeof_;
++
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -27125,35 +29780,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (size_t))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (size_t))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (size_t))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27164,29 +29828,28 @@
+@@ -30200,21 +29917,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++if test "$ac_cv_type_size_t" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (size_t), 77
-+echo "$as_me: error: cannot compute sizeof (size_t)
+ echo "$as_me: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
+    { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_size_t=0
++	       fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_size_t=0
+-else
+-  ac_cv_sizeof_size_t=0
+-fi
  fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
  _ACEOF
+@@ -30291,16 +30012,15 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
+ echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
  
- 
--  echo "$as_me:$LINENO: checking for unsigned long" >&5
--echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for unsigned long" >&5
-+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; }
- if test "${ac_cv_type_unsigned_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27197,35 +29860,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+typedef unsigned long ac__type_new_;
- int
- main ()
- {
--if ((unsigned long *) 0)
-+if ((ac__type_new_ *) 0)
-   return 0;
--if (sizeof (unsigned long))
-+if (sizeof (ac__type_new_))
-   return 0;
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27234,20 +29911,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
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
--echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; }
- 
--echo "$as_me:$LINENO: checking size of unsigned long" >&5
--echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5
-+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
+ { echo "$as_me:$LINENO: checking size of unsigned long" >&5
+ echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   if test "$ac_cv_type_unsigned_long" = yes; then
--  # The cast to unsigned long works around a bug in the HP C Compiler
-+  # The cast to long int works around a bug in the HP C Compiler
-   # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-   # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-   # This bug is HP SR number 8606223364.
-@@ -27260,10 +29938,11 @@
+-  if test "$ac_cv_type_unsigned_long" = yes; then
+-  # The cast to long int works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -30310,7 +30030,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
+-		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27271,23 +29950,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27300,10 +29992,11 @@
+@@ -30364,7 +30085,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
+-		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27311,23 +30004,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27336,30 +30042,32 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo=`expr $ac_mid + 1`
--		    if test $ac_lo -le $ac_mid; then
--		      ac_lo= ac_hi=
--		      break
--		    fi
--		    ac_mid=`expr 2 '*' $ac_mid + 1`
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--cat >conftest.$ac_ext <<_ACEOF
-+	cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -30435,7 +30157,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
+-		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27367,23 +30075,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27396,10 +30117,11 @@
+@@ -30489,7 +30212,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
+-		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27407,23 +30129,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27432,23 +30167,26 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_hi=`expr '(' $ac_mid ')' - 1`
--		       if test $ac_mid -le $ac_hi; then
--			 ac_lo= ac_hi=
--			 break
--		       fi
--		       ac_mid=`expr 2 '*' $ac_mid`
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_lo= ac_hi=
-+	ac_lo= ac_hi=
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- # Binary search between lo and hi bounds.
- while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27460,10 +30198,11 @@
+@@ -30570,7 +30294,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+		   typedef unsigned long ac__type_sizeof_;
+-		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27471,23 +30210,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27496,24 +30248,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
+@@ -30627,11 +30352,15 @@
  done
  case $ac_lo in
  ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++'') if test "$ac_cv_type_unsigned_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long)
+ echo "$as_me: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+   { (exit 77); exit 77; }; } ;;
+-   { (exit 77); exit 77; }; } ;;
++   { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_unsigned_long=0
++	       fi ;;
  esac
  else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
--echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
--   { (exit 1); exit 1; }; }
--else
    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27521,8 +30269,9 @@
+@@ -30641,7 +30370,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
--long longval () { return (long) (sizeof (unsigned long)); }
--unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+		   typedef unsigned long ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+-		   typedef unsigned long ac__type_sizeof_;
++	        typedef unsigned long ac__type_sizeof_;
++
+ static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
  #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -27531,35 +30280,44 @@
- 
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
--    exit (1);
--  if (((long) (sizeof (unsigned long))) < 0)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-     {
--      long i = longval ();
--      if (i != ((long) (sizeof (unsigned long))))
--	exit (1);
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%ld\n", i);
-     }
-   else
-     {
--      unsigned long i = ulongval ();
--      if (i != ((long) (sizeof (unsigned long))))
--	exit (1);
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-       fprintf (f, "%lu\n", i);
-     }
--  exit (ferror (f) || fclose (f) != 0);
-+  return ferror (f) || fclose (f) != 0;
- 
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27570,30 +30328,29 @@
+@@ -30700,21 +30430,25 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++if test "$ac_cv_type_unsigned_long" = yes; then
++	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long)
+ echo "$as_me: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+   { (exit 77); exit 77; }; }
+    { (exit 77); exit 77; }; }
++	       else
++	         ac_cv_sizeof_unsigned_long=0
++	       fi
  fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
- else
-   ac_cv_sizeof_unsigned_long=0
+-else
+-  ac_cv_sizeof_unsigned_long=0
+-fi
  fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ { echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+ echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
++
++
++
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
  _ACEOF
- 
- 
- 
--  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
--echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
-+echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27614,35 +30371,48 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--      echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+      { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-       { { echo "$as_me:$LINENO: error:
-        Apparently on your system our assumption sizeof size_t == sizeof unsigned long
-        does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27654,18 +30424,18 @@
-    { (exit 1); exit 1; }; }
- 
+@@ -30878,7 +30612,7 @@
+ 	kde_cv_val_pie_support=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
- 
--  echo "$as_me:$LINENO: checking for PIE support" >&5
--echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for PIE support" >&5
-+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
- if test "${kde_cv_val_pie_support+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27695,23 +30465,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27720,8 +30503,9 @@
-   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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -27735,26 +30519,26 @@
- 
- 
+     CXXFLAGS=$safe_CXXFLAGS
+@@ -31181,7 +30915,7 @@
+ 	ac_cv_func__NSGetEnviron=no
  fi
--echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
--echo "${ECHO_T}$kde_cv_val_pie_support" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
-+echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
  
--  echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
--echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
-+echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
- 
--  # Check whether --enable-pie or --disable-pie was given.
-+  # Check whether --enable-pie was given.
- if test "${enable_pie+set}" = set; then
--  enableval="$enable_pie"
--  kde_has_pie_support=$enableval
-+  enableval=$enable_pie; kde_has_pie_support=$enableval
- else
-   kde_has_pie_support=detect
--fi;
-+fi
-+
- 
-   if test "$kde_has_pie_support" = "detect"; then
-     kde_has_pie_support=$kde_cv_val_pie_support
-   fi
- 
--  echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
--echo "${ECHO_T}$kde_has_pie_support" >&6
-+  { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5
-+echo "${ECHO_T}$kde_has_pie_support" >&6; }
- 
-   KDE_USE_FPIE=""
-   KDE_USE_PIE=""
-@@ -27773,18 +30557,19 @@
- for ac_header in crt_externs.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27795,23 +30580,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27820,15 +30618,16 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
-+	ac_header_compiler=no
+ { echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
+@@ -31298,7 +31032,7 @@
+ 	eval "$as_ac_var=no"
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
  
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27837,8 +30636,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -27862,9 +30666,10 @@
- 
-   ac_header_preproc=no
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
  fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27888,25 +30693,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27918,8 +30717,8 @@
- 
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -31591,7 +31325,7 @@
  done
- 
--echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
--echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
-+echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
- if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -27946,52 +30745,59 @@
- 
- #undef _NSGetEnviron
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char _NSGetEnviron ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron)
-+#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron
- choke me
--#else
--char (*f) () = _NSGetEnviron;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != _NSGetEnviron;
-+return _NSGetEnviron ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28000,13 +30806,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 \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
--echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
-+echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; }
- if test $ac_cv_func__NSGetEnviron = yes; then
  
- cat >>confdefs.h <<\_ACEOF
-@@ -28027,9 +30834,9 @@
- for ac_func in vsnprintf snprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -28055,52 +30862,59 @@
- 
- #undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28109,13 +30923,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28132,32 +30948,32 @@
- 
- 
- 
--# Check whether --enable-embedded or --disable-embedded was given.
-+# Check whether --enable-embedded was given.
- if test "${enable_embedded+set}" = set; then
--  enableval="$enable_embedded"
--  kde_use_qt_emb=$enableval
-+  enableval=$enable_embedded; kde_use_qt_emb=$enableval
- else
-   kde_use_qt_emb=no
- 
--fi;
-+fi
-+
- 
--# Check whether --enable-qtopia or --disable-qtopia was given.
-+# Check whether --enable-qtopia was given.
- if test "${enable_qtopia+set}" = set; then
--  enableval="$enable_qtopia"
--  kde_use_qt_emb_palm=$enableval
-+  enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval
- else
-   kde_use_qt_emb_palm=no
- 
--fi;
-+fi
-+
- 
--# Check whether --enable-mac or --disable-mac was given.
-+# Check whether --enable-mac was given.
- if test "${enable_mac+set}" = set; then
--  enableval="$enable_mac"
--  kde_use_qt_mac=$enableval
-+  enableval=$enable_mac; kde_use_qt_mac=$enableval
- else
-   kde_use_qt_mac=no
- 
--fi;
-+fi
-+
- 
- # used to disable x11-specific stuff on special platforms
- 
-@@ -28173,8 +30989,8 @@
- 
- if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
- 
--echo "$as_me:$LINENO: checking for X" >&5
--echo $ECHO_N "checking for X... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for X" >&5
-+echo $ECHO_N "checking for X... $ECHO_C" >&6; }
- 
- if test "${kde_cv_have_x+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28211,8 +31027,13 @@
- /* end confdefs.h.  */
- #include <$x_direct_test_include>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -28279,6 +31100,7 @@
-     fi
-   done
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi # $ac_x_includes = NO
- 
-@@ -28308,23 +31130,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28335,7 +31170,7 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--LIBS="$ac_save_LIBS"
-+	LIBS="$ac_save_LIBS"
- # First see if replacing the include by lib works.
- # Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28383,6 +31218,7 @@
-   done
- done
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
-@@ -28393,21 +31229,26 @@
- *-*-solaris*)
-   ;;
- *)
--  rm -fr conftest.dir
-+  rm -f -r conftest.dir
- if mkdir conftest.dir; then
-   cd conftest.dir
--  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-   cat >Imakefile <<'_ACEOF'
--acfindx:
--	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-+incroot:
-+	@echo incroot='${INCROOT}'
-+usrlibdir:
-+	@echo usrlibdir='${USRLIBDIR}'
-+libdir:
-+	@echo libdir='${LIBDIR}'
- _ACEOF
--  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-+    for ac_var in incroot usrlibdir libdir; do
-+      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-+    done
-     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-     for ac_extension in a so sl; do
--      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
--	 test -f $ac_im_libdir/libX11.$ac_extension; then
-+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
- 	ac_im_usrlibdir=$ac_im_libdir; break
-       fi
-     done
-@@ -28415,7 +31256,7 @@
-     # bogus both because they are the default anyway, and because
-     # using them would break gcc on systems where it needs fixed includes.
-     case $ac_im_incroot in
--	/usr/include) ;;
-+	/usr/include) ac_x_includes= ;;
- 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-     esac
-     case $ac_im_usrlibdir in
-@@ -28424,7 +31265,7 @@
-     esac
-   fi
-   cd ..
--  rm -fr conftest.dir
-+  rm -f -r conftest.dir
- fi
  
-   if test -z "$ac_x_includes"; then
-@@ -28468,12 +31309,12 @@
- eval "$kde_cv_have_x"
- 
- if test "$have_x" != yes; then
--  echo "$as_me:$LINENO: result: $have_x" >&5
--echo "${ECHO_T}$have_x" >&6
-+  { echo "$as_me:$LINENO: result: $have_x" >&5
-+echo "${ECHO_T}$have_x" >&6; }
-   no_x=yes
- else
--  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
--echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
-+  { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-+echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; }
+@@ -31785,7 +31519,7 @@
+ 	ac_cv_lib_ICE_IceConnectionNumber=no
  fi
  
- if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28501,8 +31342,8 @@
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
--echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
--echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28515,39 +31356,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char IceConnectionNumber ();
- int
- main ()
- {
--IceConnectionNumber ();
-+return IceConnectionNumber ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28556,14 +31410,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
--echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
- if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-   LIBSM="-lSM -lICE"
- fi
-@@ -28572,8 +31427,8 @@
+@@ -31876,7 +31610,7 @@
  
- LIB_X11='-lX11 $(LIBSOCKET)'
- 
--echo "$as_me:$LINENO: checking for libXext" >&5
--echo $ECHO_N "checking for libXext... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libXext" >&5
-+echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
- if test "${kde_cv_have_libXext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28607,23 +31462,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28632,9 +31500,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_have_libXext=no
-+	kde_cv_have_libXext=no
- 
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -28644,8 +31513,8 @@
+ LDFLAGS=$kde_ldflags_safe
+@@ -32031,7 +31765,7 @@
+ 	eval "$as_ac_Lib=no"
  fi
  
- 
--echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
--echo "${ECHO_T}$kde_cv_have_libXext" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-+echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
- 
- if test "$kde_cv_have_libXext" = "no"; then
-   { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28707,8 +31576,8 @@
-     else
-       PTHREAD_LIBS_save="$PTHREAD_LIBS"
-       PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
--      echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
--echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
-+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
- 
-      kde_save_LDFLAGS="$LDFLAGS"
-           kde_save_LIBS="$LIBS"
-@@ -28719,9 +31588,9 @@
- 	;;
-      esac
-      as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
--echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -28733,39 +31602,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char pthread_create ();
- int
- main ()
- {
--pthread_create ();
-+return pthread_create ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28774,14 +31656,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Lib'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-   LIBPTHREAD="$PTHREAD_LIBS_save"
+@@ -32121,7 +31855,7 @@
+ 	ac_cv_lib_pthread_pthread_create=no
  fi
-@@ -28794,8 +31678,8 @@
-   fi
  
-     if test -z "$LIBPTHREAD"; then
--    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -28808,39 +31692,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char pthread_create ();
- int
- main ()
- {
--pthread_create ();
-+return pthread_create ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28849,14 +31746,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
- if test $ac_cv_lib_pthread_pthread_create = yes; then
-   LIBPTHREAD="-lpthread"
+@@ -32200,7 +31934,7 @@
+ echo "${ECHO_T}no" >&6; }
  fi
-@@ -28864,8 +31762,8 @@
-   fi
  
-     if test -z "$LIBPTHREAD" ; then
--    echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-     kde_safe_libs=$LIBS
-     LIBS="$LIBS -lpthread"
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -28884,38 +31782,52 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         LIBPTHREAD="-lpthread"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
-@@ -28931,16 +31843,15 @@
-       USE_THREADS=""
-       if test -z "$LIBPTHREAD"; then
+   fi
+@@ -32291,7 +32025,7 @@
  
--echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
--echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
-+echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
- kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -28967,23 +31878,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28992,7 +31916,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -29006,13 +31932,13 @@
- fi
+   ac_ext=c
+@@ -32398,7 +32132,7 @@
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  USE_THREADS="-D_THREAD_SAFE -pthread"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
  fi
-@@ -29024,16 +31950,15 @@
-     case $host_os in
-  	solaris*)
  
--echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
--echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
-+echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; }
- kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--   ac_ext=cc
-+   ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29060,23 +31985,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29085,7 +32023,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -29099,13 +32039,13 @@
+   ac_ext=c
+@@ -32587,7 +32321,7 @@
+ 	eval "ac_cv_lib_z=no"
  fi
  
- if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  :
-  USE_THREADS="-mt"
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-  :
- 
- fi
-@@ -29132,17 +32072,17 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for extra includes" >&5
--echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for extra includes" >&5
-+echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; }
- 
--# Check whether --with-extra-includes or --without-extra-includes was given.
-+# Check whether --with-extra-includes was given.
- if test "${with_extra_includes+set}" = set; then
--  withval="$with_extra_includes"
--  kde_use_extra_includes="$withval"
-+  withval=$with_extra_includes; kde_use_extra_includes="$withval"
- else
-   kde_use_extra_includes=NONE
- 
--fi;
-+fi
-+
- kde_extra_includes=
- if test -n "$kde_use_extra_includes" && \
-    test "$kde_use_extra_includes" != "NONE"; then
-@@ -29160,21 +32100,21 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
--echo "${ECHO_T}$kde_use_extra_includes" >&6
-+{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
-+echo "${ECHO_T}$kde_use_extra_includes" >&6; }
- 
- kde_extra_libs=
--echo "$as_me:$LINENO: checking for extra libs" >&5
--echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for extra libs" >&5
-+echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; }
- 
--# Check whether --with-extra-libs or --without-extra-libs was given.
-+# Check whether --with-extra-libs was given.
- if test "${with_extra_libs+set}" = set; then
--  withval="$with_extra_libs"
--  kde_use_extra_libs=$withval
-+  withval=$with_extra_libs; kde_use_extra_libs=$withval
- else
-   kde_use_extra_libs=NONE
- 
--fi;
-+fi
-+
- if test -n "$kde_use_extra_libs" && \
-    test "$kde_use_extra_libs" != "NONE"; then
- 
-@@ -29193,14 +32133,14 @@
- 
- 
- 
--echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
--echo "${ECHO_T}$kde_use_extra_libs" >&6
-+{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
-+echo "${ECHO_T}$kde_use_extra_libs" >&6; }
- 
- 
- 
- 
--echo "$as_me:$LINENO: checking for libz" >&5
--echo $ECHO_N "checking for libz... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libz" >&5
-+echo $ECHO_N "checking for libz... $ECHO_C" >&6; }
- if test "${ac_cv_lib_z+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29234,23 +32174,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29259,8 +32212,9 @@
-   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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -29274,8 +32228,8 @@
- _ACEOF
+ CFLAGS="$kde_save_CFLAGS"
+@@ -32700,7 +32434,7 @@
  
-   LIBZ="$ac_cv_lib_z"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
--echo "${ECHO_T}$ac_cv_lib_z" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-+echo "${ECHO_T}$ac_cv_lib_z" >&6; }
- else
-   { { echo "$as_me:$LINENO: error: not found.
-           Possibly configure picks up an outdated version
-@@ -29295,8 +32249,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for libpng" >&5
--echo $ECHO_N "checking for libpng... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libpng" >&5
-+echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29332,23 +32286,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29357,9 +32324,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "ac_cv_lib_png=no"
-+	eval "ac_cv_lib_png=no"
- 
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -29374,19 +32342,19 @@
- 
-   LIBPNG="$ac_cv_lib_png"
- 
--  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
--echo "${ECHO_T}$ac_cv_lib_png" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-+echo "${ECHO_T}$ac_cv_lib_png" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   LIBPNG=""
- 
+ CFLAGS="$kde_save_CFLAGS"
+@@ -32800,7 +32534,7 @@
+ 	eval "ac_cv_lib_jpeg_6b=no"
  fi
  
- 
- 
--echo "$as_me:$LINENO: checking for libjpeg6b" >&5
--echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
- if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29419,23 +32387,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29444,8 +32425,9 @@
-   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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -29456,14 +32438,14 @@
- 
- if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-   LIBJPEG="$ac_cv_lib_jpeg_6b"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
--echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
--echo "$as_me:$LINENO: checking for libjpeg" >&5
--echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libjpeg" >&5
-+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
- if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -29496,23 +32478,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29521,8 +32516,9 @@
-   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"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -32891,7 +32625,7 @@
+ 	eval "ac_cv_lib_jpeg_normal=no"
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -29533,11 +32529,11 @@
- 
- if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-   LIBJPEG="$ac_cv_lib_jpeg_normal"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
--echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
-        LIBJPEG=
- 
-@@ -29557,7 +32553,7 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -32925,7 +32659,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29560: $i/$j" >&5
-+    echo "configure: 32556: $i/$j" >&5
+-    echo "configure: 32928: $i/$j" >&5
++    echo "configure: 32662: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29604,14 +32600,14 @@
- 
- 
- 
--   echo "$as_me:$LINENO: checking for perl" >&5
--echo $ECHO_N "checking for perl... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for perl" >&5
-+echo $ECHO_N "checking for perl... $ECHO_C" >&6; }
-    if test -n "$PERL"; then
-         kde_cv_path="$PERL";
-    else
-         kde_cache=`echo perl | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -29654,8 +32650,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
- 		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
- We need perl to generate some code." >&5
-@@ -29664,8 +32660,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       PERL=$kde_cv_path
- 
-    fi
-@@ -29679,10 +32675,9 @@
- 
- 
- 
--# Check whether --enable-mt or --disable-mt was given.
-+# Check whether --enable-mt was given.
- if test "${enable_mt+set}" = set; then
--  enableval="$enable_mt"
--  kde_use_qt_mt=$enableval
-+  enableval=$enable_mt; kde_use_qt_mt=$enableval
- else
- 
-     if test $kde_qtver = 3; then
-@@ -29692,7 +32687,8 @@
-     fi
- 
- 
--fi;
-+fi
-+
- 
- USING_QT_MT=""
- 
-@@ -29712,13 +32708,13 @@
-   else
-     kde_check_threading_default=yes
-   fi
--  # Check whether --enable-threading or --disable-threading was given.
-+  # Check whether --enable-threading was given.
- if test "${enable_threading+set}" = set; then
--  enableval="$enable_threading"
--  kde_use_threading=$enableval
-+  enableval=$enable_threading; kde_use_threading=$enableval
- else
-   kde_use_threading=$kde_check_threading_default
--fi;
-+fi
-+
-   if test "x$kde_use_threading" = "xyes"; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -29790,8 +32786,8 @@
-   LIBQT="$LIBQT $LIBDL"
- fi
- 
--echo "$as_me:$LINENO: checking for Qt" >&5
--echo $ECHO_N "checking for Qt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Qt" >&5
-+echo $ECHO_N "checking for Qt... $ECHO_C" >&6; }
- 
- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
- LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29800,34 +32796,34 @@
- qt_libraries=""
- qt_includes=""
- 
--# Check whether --with-qt-dir or --without-qt-dir was given.
-+# Check whether --with-qt-dir was given.
- if test "${with_qt_dir+set}" = set; then
--  withval="$with_qt_dir"
--    ac_qt_includes="$withval"/include
-+  withval=$with_qt_dir;   ac_qt_includes="$withval"/include
-        ac_qt_libraries="$withval"/lib${kdelibsuff}
-        ac_qt_bindir="$withval"/bin
- 
--fi;
-+fi
-+
- 
- 
--# Check whether --with-qt-includes or --without-qt-includes was given.
-+# Check whether --with-qt-includes was given.
- if test "${with_qt_includes+set}" = set; then
--  withval="$with_qt_includes"
--
-+  withval=$with_qt_includes;
-        ac_qt_includes="$withval"
- 
--fi;
-+fi
-+
- 
- kde_qt_libs_given=no
- 
- 
--# Check whether --with-qt-libraries or --without-qt-libraries was given.
-+# Check whether --with-qt-libraries was given.
- if test "${with_qt_libraries+set}" = set; then
--  withval="$with_qt_libraries"
--    ac_qt_libraries="$withval"
-+  withval=$with_qt_libraries;   ac_qt_libraries="$withval"
-        kde_qt_libs_given=yes
- 
--fi;
-+fi
-+
- 
- if test "${ac_cv_have_qt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -29855,7 +32851,7 @@
+@@ -33223,7 +32957,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29858: $i/$j" >&5
-+    echo "configure: 32854: $i/$j" >&5
+-    echo "configure: 33226: $i/$j" >&5
++    echo "configure: 32960: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -29892,8 +32888,7 @@
- ac_qt_libraries="$qt_libdir"
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30030,13 +33025,13 @@
- eval "$ac_cv_have_qt"
- 
- if test "$have_qt" != yes; then
--  echo "$as_me:$LINENO: result: $have_qt" >&5
--echo "${ECHO_T}$have_qt" >&6;
-+  { echo "$as_me:$LINENO: result: $have_qt" >&5
-+echo "${ECHO_T}$have_qt" >&6; };
- else
-   ac_cv_have_qt="have_qt=yes \
-     ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
--  echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
--echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
-+  { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
-+echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; }
- 
-   qt_libraries="$ac_qt_libraries"
-   qt_includes="$ac_qt_includes"
-@@ -30045,15 +33040,14 @@
- if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
- 
- 
--echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
--echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
-+echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; }
- if test "${kde_cv_qt_direct+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30174,12 +33168,12 @@
- 
- 
- if test "$kde_cv_qt_direct" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   qt_libraries=
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
+@@ -33930,7 +33664,7 @@
+ 	eval "kde_cv_qt_jpeg=yes"
  fi
  
-@@ -30217,14 +33211,14 @@
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for moc" >&5
--echo $ECHO_N "checking for moc... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for moc" >&5
-+echo $ECHO_N "checking for moc... $ECHO_C" >&6; }
-    if test -n "$MOC"; then
-         kde_cv_path="$MOC";
-    else
-         kde_cache=`echo moc | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30267,8 +33261,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
- Please check whether you installed Qt correctly.
-@@ -30289,22 +33283,22 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MOC=$kde_cv_path
- 
-    fi
- 
-    if test -z "$UIC_NOT_NEEDED"; then
- 
--   echo "$as_me:$LINENO: checking for uic" >&5
--echo $ECHO_N "checking for uic... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for uic" >&5
-+echo $ECHO_N "checking for uic... $ECHO_C" >&6; }
-    if test -n "$UIC_PATH"; then
-         kde_cv_path="$UIC_PATH";
-    else
-         kde_cache=`echo uic | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30347,12 +33341,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-       UIC_PATH=""
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       UIC_PATH=$kde_cv_path
- 
-    fi
-@@ -30382,10 +33376,10 @@
- 
-        if test $kde_qtver = 3; then
- 
--    echo "$as_me:$LINENO: checking whether uic supports -L " >&5
--echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether uic supports -L " >&5
-+echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; }
-     kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
--    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-+    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30408,22 +33402,22 @@
- 
- 
-     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         :
-         ac_uic_supports_libpath=yes
-     else
--        echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+        { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-         :
-         ac_uic_supports_libpath=no
-     fi
- 
- 
--    echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
--echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
-+echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; }
-     kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
--    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-+    if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -30446,13 +33440,13 @@
- 
- 
-     if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         :
-         ac_uic_supports_nounload=yes
-     else
--        echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+        { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-         :
-         ac_uic_supports_nounload=no
-     fi
-@@ -30483,15 +33477,14 @@
- 
- 
- if test -n "$LIBJPEG"; then
--echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
--echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
-+echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; }
- if test "${kde_cv_qt_jpeg+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30524,23 +33517,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -30549,8 +33555,9 @@
-   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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -30567,12 +33574,12 @@
- 
- 
- if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   LIBJPEG_QT='$(LIBJPEG)'
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   LIBJPEG_QT=
- fi
- 
-@@ -30603,15 +33610,15 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for rpath" >&5
--echo $ECHO_N "checking for rpath... $ECHO_C" >&6
--# Check whether --enable-rpath or --disable-rpath was given.
-+{ echo "$as_me:$LINENO: checking for rpath" >&5
-+echo $ECHO_N "checking for rpath... $ECHO_C" >&6; }
-+# Check whether --enable-rpath was given.
- if test "${enable_rpath+set}" = set; then
--  enableval="$enable_rpath"
--  USE_RPATH=$enableval
-+  enableval=$enable_rpath; USE_RPATH=$enableval
- else
-   USE_RPATH=yes
--fi;
-+fi
-+
- 
- if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
- 
-@@ -30635,11 +33642,11 @@
- 
- 
- 
--echo "$as_me:$LINENO: result: $USE_RPATH" >&5
--echo "${ECHO_T}$USE_RPATH" >&6
-+{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5
-+echo "${ECHO_T}$USE_RPATH" >&6; }
- 
--echo "$as_me:$LINENO: checking for KDE" >&5
--echo $ECHO_N "checking for KDE... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE" >&5
-+echo $ECHO_N "checking for KDE... $ECHO_C" >&6; }
- 
- if test "${prefix}" != NONE; then
-   kde_includes=${includedir}
-@@ -30691,7 +33698,7 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -34070,7 +33804,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30694: $i/$j" >&5
-+    echo "configure: 33701: $i/$j" >&5
+-    echo "configure: 34073: $i/$j" >&5
++    echo "configure: 33807: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30721,7 +33728,7 @@
+@@ -34100,7 +33834,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30724: $i/$j" >&5
-+    echo "configure: 33731: $i/$j" >&5
+-    echo "configure: 34103: $i/$j" >&5
++    echo "configure: 33837: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30739,7 +33746,7 @@
+@@ -34118,7 +33852,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30742: $i/$j" >&5
-+    echo "configure: 33749: $i/$j" >&5
+-    echo "configure: 34121: $i/$j" >&5
++    echo "configure: 33855: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30798,12 +33805,12 @@
-  fi
-  if test "$exec_prefix" = NONE; then
-   ac_kde_exec_prefix="$ac_kde_prefix"
--  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
--echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
-+  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
-+echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; }
-  else
-   ac_kde_exec_prefix="$exec_prefix"
--  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
--echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
-+  { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
-+echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; }
-  fi
- 
-  kde_libraries="${libdir}"
-@@ -30812,8 +33819,8 @@
- else
-   ac_cv_have_kde="have_kde=yes \
-     ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
--  echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
--echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
-+  { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
-+echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; }
- 
-   kde_libraries="$ac_kde_libraries"
-   kde_includes="$ac_kde_includes"
-@@ -30851,8 +33858,8 @@
- 
- if test x$ac_uic_supports_libpath = xyes; then
- 
--echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
--echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
-+echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; }
- if test "${kde_cv_uic_plugins+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -30895,8 +33902,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
--echo "${ECHO_T}$kde_cv_uic_plugins" >&6
-+{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
-+echo "${ECHO_T}$kde_cv_uic_plugins" >&6; }
- if test "$kde_cv_uic_plugins" != yes; then
- 	{ { echo "$as_me:$LINENO: error:
- you need to install kdelibs first.
-@@ -30928,10 +33935,9 @@
- 
- 
- 
--  # Check whether --enable-path-check or --disable-path-check was given.
-+  # Check whether --enable-path-check was given.
- if test "${enable_path_check+set}" = set; then
--  enableval="$enable_path_check"
--
-+  enableval=$enable_path_check;
-   if test "$enableval" = "no";
-     then ac_use_path_checking="default"
-     else ac_use_path_checking=""
-@@ -30945,13 +33951,14 @@
-   fi
- 
- 
--fi;
-+fi
-+
- 
- 
- 
- 
--echo "$as_me:$LINENO: checking for KDE paths" >&5
--echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE paths" >&5
-+echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; }
- kde_result=""
- kde_cached_paths=yes
- if test "${kde_cv_all_paths+set}" = set; then
-@@ -31062,15 +34069,14 @@
- else
- 
-   if test $kde_qtver = 1; then
--     echo "$as_me:$LINENO: result: compiling" >&5
--echo "${ECHO_T}compiling" >&6
--
-+     { echo "$as_me:$LINENO: result: compiling" >&5
-+echo "${ECHO_T}compiling" >&6; }
- 
--    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
--echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
- 
-+    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
- 
--     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31122,8 +34128,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--   echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+   { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  else
-    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
- Check, if you installed the KDE header files correctly.
-@@ -31162,8 +34168,8 @@
-      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-   fi
- 
--echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
--echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
- ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
- 
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31171,8 +34177,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
- Check, if your compiler is installed correctly and if you have used the
-@@ -31365,15 +34371,14 @@
- else
- 
-   if test $kde_qtver = 1; then
--     echo "$as_me:$LINENO: result: compiling" >&5
--echo "${ECHO_T}compiling" >&6
-+     { echo "$as_me:$LINENO: result: compiling" >&5
-+echo "${ECHO_T}compiling" >&6; }
- 
- 
--    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
--echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
- 
--
--     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31425,8 +34430,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--   echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+   { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-  else
-    { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
- Check, if you installed the KDE header files correctly.
-@@ -31465,8 +34470,8 @@
-      KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-   fi
- 
--echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
--echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; }
- ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
- 
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31474,8 +34479,8 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-   { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
- Check, if your compiler is installed correctly and if you have used the
-@@ -31567,22 +34572,22 @@
-    { (exit 1); exit 1; }; }
- else
-   rm -f conftest*
--  echo "$as_me:$LINENO: result: $kde_result" >&5
--echo "${ECHO_T}$kde_result" >&6
-+  { echo "$as_me:$LINENO: result: $kde_result" >&5
-+echo "${ECHO_T}$kde_result" >&6; }
- fi
- 
- bindir=$kde_bindir
- 
- 
- 
--# Check whether --with-arts or --without-arts was given.
-+# Check whether --with-arts was given.
- if test "${with_arts+set}" = set; then
--  withval="$with_arts"
--  build_arts=$withval
-+  withval=$with_arts; build_arts=$withval
- else
-   build_arts=yes
- 
--fi;
-+fi
-+
- 
- 
- if test "$build_arts" '!=' "no"; then
-@@ -31615,14 +34620,14 @@
- 
-         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
- 
--   echo "$as_me:$LINENO: checking for dcopidl" >&5
--echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dcopidl" >&5
-+echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; }
-    if test -n "$DCOPIDL"; then
-         kde_cv_path="$DCOPIDL";
-    else
-         kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31665,8 +34670,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
- Please check whether you installed KDE correctly.
-@@ -31677,21 +34682,21 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DCOPIDL=$kde_cv_path
- 
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
--echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
-+echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; }
-    if test -n "$DCOPIDL2CPP"; then
-         kde_cv_path="$DCOPIDL2CPP";
-    else
-         kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31734,8 +34739,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
- Please check whether you installed KDE correctly.
-@@ -31746,22 +34751,22 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DCOPIDL2CPP=$kde_cv_path
- 
-    fi
- 
-         if test "$build_arts" '!=' "no"; then
- 
--   echo "$as_me:$LINENO: checking for mcopidl" >&5
--echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for mcopidl" >&5
-+echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; }
-    if test -n "$MCOPIDL"; then
-         kde_cv_path="$MCOPIDL";
-    else
-         kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31804,8 +34809,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
- Please check whether you installed aRts correctly or use
-@@ -31818,21 +34823,21 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MCOPIDL=$kde_cv_path
- 
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for artsc-config" >&5
--echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for artsc-config" >&5
-+echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; }
-    if test -n "$ARTSCCONFIG"; then
-         kde_cv_path="$ARTSCCONFIG";
-    else
-         kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31875,8 +34880,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
- Please check whether you installed aRts correctly or use
-@@ -31889,22 +34894,22 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       ARTSCCONFIG=$kde_cv_path
- 
-    fi
- 
-         fi
- 
--   echo "$as_me:$LINENO: checking for meinproc" >&5
--echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for meinproc" >&5
-+echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; }
-    if test -n "$MEINPROC"; then
-         kde_cv_path="$MEINPROC";
-    else
-         kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -31947,12 +34952,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MEINPROC=$kde_cv_path
- 
-    fi
-@@ -31981,14 +34986,14 @@
- 
-         if test -n "$kde32ornewer"; then
- 
--   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
--echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-+echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; }
-    if test -n "$KCONFIG_COMPILER"; then
-         kde_cv_path="$KCONFIG_COMPILER";
-    else
-         kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32031,8 +35036,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
- Please check whether you installed KDE correctly.
-@@ -32043,21 +35048,21 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       KCONFIG_COMPILER=$kde_cv_path
- 
-    fi
- 
- 
--   echo "$as_me:$LINENO: checking for dcopidlng" >&5
--echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dcopidlng" >&5
-+echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; }
-    if test -n "$DCOPIDLNG"; then
-         kde_cv_path="$DCOPIDLNG";
-    else
-         kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32100,8 +35105,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
- Please check whether you installed KDE correctly.
-@@ -32112,8 +35117,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DCOPIDLNG=$kde_cv_path
- 
-    fi
-@@ -32121,14 +35126,14 @@
-         fi
-         if test -n "$kde33ornewer"; then
- 
--   echo "$as_me:$LINENO: checking for makekdewidgets" >&5
--echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for makekdewidgets" >&5
-+echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; }
-    if test -n "$MAKEKDEWIDGETS"; then
-         kde_cv_path="$MAKEKDEWIDGETS";
-    else
-         kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32171,8 +35176,8 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-     { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
- Please check whether you installed KDE correctly.
-@@ -32183,8 +35188,8 @@
-    { (exit 1); exit 1; }; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MAKEKDEWIDGETS=$kde_cv_path
- 
-    fi
-@@ -32192,14 +35197,14 @@
- 
-         fi
- 
--   echo "$as_me:$LINENO: checking for xmllint" >&5
--echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for xmllint" >&5
-+echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
-    if test -n "$XMLLINT"; then
-         kde_cv_path="$XMLLINT";
-    else
-         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32242,12 +35247,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-       XMLLINT=""
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       XMLLINT=$kde_cv_path
- 
-    fi
-@@ -32262,7 +35267,7 @@
+@@ -35639,7 +35373,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32265: $i/$j" >&5
-+    echo "configure: 35270: $i/$j" >&5
+-    echo "configure: 35642: $i/$j" >&5
++    echo "configure: 35376: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32431,18 +35436,19 @@
- for ac_header in unistd.h sys/param.h floatingpoint.h paths.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -32453,23 +35459,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32478,15 +35497,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -32495,8 +35515,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -32520,9 +35545,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -32546,25 +35572,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -32576,8 +35596,8 @@
- 
- done
- 
--echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -32603,23 +35623,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32645,23 +35678,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32670,14 +35716,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
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--# It does not; compile a test program.
-+	# It does not; compile a test program.
- if test "$cross_compiling" = yes; then
-   # try to guess the endianness by grepping values into an object file
-   ac_cv_c_bigendian=unknown
-@@ -32687,11 +35734,11 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
--short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+@@ -35986,7 +35720,8 @@
  int
  main ()
-@@ -32702,23 +35749,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32737,7 +35797,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -32746,27 +35808,41 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+$ac_includes_default
- int
- main ()
  {
-+
-   /* Are we little or big endian?  From Harbison&Steele.  */
-   union
-   {
--    long l;
--    char c[sizeof (long)];
-+    long int l;
-+    char c[sizeof (long int)];
-   } u;
-   u.l = 1;
--  exit (u.c[sizeof (long) - 1] == 1);
-+  return u.c[sizeof (long int) - 1] == 1;
-+
-+  ;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32779,13 +35855,16 @@
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-+
- rm -f 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in
-   yes)
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
++	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
+  bogus endian macros
+ #endif
  
-@@ -32804,8 +35883,8 @@
- esac
- 
- 
--echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
--echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
-+echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6; }
- if test "${ac_cv_maxpathlen+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -32841,8 +35920,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
--echo "${ECHO_T}$ac_cv_maxpathlen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
-+echo "${ECHO_T}$ac_cv_maxpathlen" >&6; }
- 
- cat >>confdefs.h <<_ACEOF
- #define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -32851,8 +35930,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for Qt docs" >&5
--echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Qt docs" >&5
-+echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
- kde_qtdir=
- if test "${with_qt_dir+set}" = set; then
-   kde_qtdir="$with_qt_dir"
-@@ -32864,7 +35943,7 @@
+@@ -36315,7 +36050,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 32867: $i/$j" >&5
-+    echo "configure: 35946: $i/$j" >&5
+-    echo "configure: 36318: $i/$j" >&5
++    echo "configure: 36053: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -32873,20 +35952,20 @@
-   done
- done
+@@ -37278,7 +37013,7 @@
  
--echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
--echo "${ECHO_T}$QTDOCDIR" >&6
-+{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
-+echo "${ECHO_T}$QTDOCDIR" >&6; }
- 
- 
- 
- 
--   echo "$as_me:$LINENO: checking for dot" >&5
--echo $ECHO_N "checking for dot... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for dot" >&5
-+echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
-    if test -n "$DOT"; then
-         kde_cv_path="$DOT";
-    else
-         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32929,12 +36008,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DOT=$kde_cv_path
- 
-    fi
-@@ -32946,14 +36025,14 @@
  fi
  
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
  
--   echo "$as_me:$LINENO: checking for doxygen" >&5
--echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for doxygen" >&5
-+echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
-    if test -n "$DOXYGEN"; then
-         kde_cv_path="$DOXYGEN";
-    else
-         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+ LIBS="$kde_save_LIBS"
+@@ -37387,7 +37122,7 @@
  
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -32996,12 +36075,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       DOXYGEN=$kde_cv_path
- 
-    fi
-@@ -33026,14 +36105,14 @@
- 
- have_imagemagick=no
- 
--   echo "$as_me:$LINENO: checking for Magick-config" >&5
--echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for Magick-config" >&5
-+echo $ECHO_N "checking for Magick-config... $ECHO_C" >&6; }
-    if test -n "$MAGICK_CONFIG"; then
-         kde_cv_path="$MAGICK_CONFIG";
-    else
-         kde_cache=`echo Magick-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -33076,15 +36155,15 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-   { echo "$as_me:$LINENO: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&5
- echo "$as_me: WARNING: Could not find ImageMagick anywhere, check http://www.imagemagick.org/ for ImageMagick >= 5.5.2." >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MAGICK_CONFIG=$kde_cv_path
- 
-    fi
-@@ -33167,12 +36246,11 @@
- 
- # --- Check for KDE 3.2 or 3.3 ---
- 
--echo "$as_me:$LINENO: checking for KDE version" >&5
--echo $ECHO_N "checking for KDE version... $ECHO_C" >&6
--
-+{ echo "$as_me:$LINENO: checking for KDE version" >&5
-+echo $ECHO_N "checking for KDE version... $ECHO_C" >&6; }
- 
- 
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33195,23 +36273,36 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33221,9 +36312,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--need_kde32_compat="yes"
-+	need_kde32_compat="yes"
- 
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
- cat >conftest.$ac_ext <<_ACEOF
-@@ -33235,23 +36327,36 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33261,9 +36366,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--need_kde33_compat="yes"
-+	need_kde33_compat="yes"
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- cat >conftest.$ac_ext <<_ACEOF
-@@ -33275,23 +36381,36 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33301,9 +36420,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--need_kde34_compat="yes"
-+	need_kde34_compat="yes"
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- cat >conftest.$ac_ext <<_ACEOF
-@@ -33315,23 +36435,36 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33341,9 +36474,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--need_kde351_compat="yes"
-+	need_kde351_compat="yes"
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CXXFLAGS="$kdeversion_save_CXXFLAGS"
- LIBS="$kdeversion_safe_LIBS"
-@@ -33355,23 +36489,23 @@
- 
- 
- if test "$need_kde32_compat" = "yes"; then
--	echo "$as_me:$LINENO: result: KDE 3.2.x" >&5
--echo "${ECHO_T}KDE 3.2.x" >&6
-+	{ echo "$as_me:$LINENO: result: KDE 3.2.x" >&5
-+echo "${ECHO_T}KDE 3.2.x" >&6; }
- else
- 	if test "$need_kde33_compat" = "yes"; then
--		echo "$as_me:$LINENO: result: KDE 3.3.x" >&5
--echo "${ECHO_T}KDE 3.3.x" >&6
-+		{ echo "$as_me:$LINENO: result: KDE 3.3.x" >&5
-+echo "${ECHO_T}KDE 3.3.x" >&6; }
- 	else
- 		if test "$need_kde34_compat" = "yes"; then
--			echo "$as_me:$LINENO: result: KDE 3.4.x" >&5
--echo "${ECHO_T}KDE 3.4.x" >&6
-+			{ echo "$as_me:$LINENO: result: KDE 3.4.x" >&5
-+echo "${ECHO_T}KDE 3.4.x" >&6; }
-                 else
-                         if test "$need_kde351_compat" = "yes"; then
--                                echo "$as_me:$LINENO: result: KDE 3.5.x (x < 2)" >&5
--echo "${ECHO_T}KDE 3.5.x (x < 2)" >&6
-+                                { echo "$as_me:$LINENO: result: KDE 3.5.x (x < 2)" >&5
-+echo "${ECHO_T}KDE 3.5.x (x < 2)" >&6; }
-                         else
--			        echo "$as_me:$LINENO: result: KDE 3.5.x (x >=2) or SVN trunk" >&5
--echo "${ECHO_T}KDE 3.5.x (x >=2) or SVN trunk" >&6
-+			        { echo "$as_me:$LINENO: result: KDE 3.5.x (x >=2) or SVN trunk" >&5
-+echo "${ECHO_T}KDE 3.5.x (x >=2) or SVN trunk" >&6; }
-                         fi
- 		fi
- 	fi
-@@ -33435,14 +36569,14 @@
- # --- OpenEXR check ---
- 
- 
--   echo "$as_me:$LINENO: checking for pkg-config" >&5
--echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
-    if test -n "$PKGCONFIG"; then
-         kde_cv_path="$PKGCONFIG";
-    else
-         kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -33485,22 +36619,22 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-   { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
- echo "$as_me: WARNING: Could not find pkg-config" >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       PKGCONFIG=$kde_cv_path
- 
-    fi
- 
- 
--echo "$as_me:$LINENO: checking for OpenEXR" >&5
--echo $ECHO_N "checking for OpenEXR... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for OpenEXR" >&5
-+echo $ECHO_N "checking for OpenEXR... $ECHO_C" >&6; }
- 
- if test -n "$PKGCONFIG"; then
-   vers=`$PKGCONFIG OpenEXR --modversion 2>/dev/null`
-@@ -33532,11 +36666,11 @@
- 
- if test -n "$OPENEXR_LIBS"
- then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+  { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- fi
- 
- 
-@@ -33567,16 +36701,15 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for libtiff tiff" >&5
--echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libtiff tiff" >&5
-+echo $ECHO_N "checking for libtiff tiff... $ECHO_C" >&6; }
- 
- if test "${kde_cv_libtiff_tiff+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33612,23 +36745,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33643,6 +36789,7 @@
-     kde_cv_libtiff_tiff=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -33659,20 +36806,19 @@
+ LIBS="$kde_save_LIBS"
+@@ -37529,7 +37264,7 @@
  
- 
- if test "$kde_cv_libtiff_tiff" = "no"; then
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     LIBTIFF=""
- 
--echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
--echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libtiff tiff34" >&5
-+echo $ECHO_N "checking for libtiff tiff34... $ECHO_C" >&6; }
- 
- if test "${kde_cv_libtiff_tiff34+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33708,23 +36854,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33739,6 +36898,7 @@
-     kde_cv_libtiff_tiff34=no
- 
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
  
-@@ -33755,14 +36915,14 @@
- 
- 
- if test "$kde_cv_libtiff_tiff34" = "no"; then
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     LIBTIFF=""
- 
- else
-     LIBTIFF="$kde_cv_libtiff_tiff34"
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBTIFF 1
-@@ -33774,8 +36934,8 @@
- 
- else
-     LIBTIFF="$kde_cv_libtiff_tiff"
--    echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBTIFF 1
-@@ -33802,8 +36962,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for libpng" >&5
--echo $ECHO_N "checking for libpng... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libpng" >&5
-+echo $ECHO_N "checking for libpng... $ECHO_C" >&6; }
- if test "${ac_cv_lib_png+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -33839,23 +36999,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33864,9 +37037,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "ac_cv_lib_png=no"
-+	eval "ac_cv_lib_png=no"
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -33881,11 +37055,11 @@
- 
-   LIBPNG="$ac_cv_lib_png"
- 
--  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
--echo "${ECHO_T}$ac_cv_lib_png" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-+echo "${ECHO_T}$ac_cv_lib_png" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   LIBPNG=""
- 
+ CFLAGS="$kde_save_CFLAGS"
+@@ -37640,7 +37375,7 @@
+ 	eval "ac_cv_lib_jpeg_6b=no"
  fi
-@@ -33903,8 +37077,8 @@
  
- 
- 
--echo "$as_me:$LINENO: checking for libjpeg6b" >&5
--echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; }
- if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -33937,23 +37111,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33962,8 +37149,9 @@
-   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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -33974,14 +37162,14 @@
- 
- if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-   LIBJPEG="$ac_cv_lib_jpeg_6b"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
--echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
--echo "$as_me:$LINENO: checking for libjpeg" >&5
--echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for libjpeg" >&5
-+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; }
- if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -34014,23 +37202,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -34039,8 +37240,9 @@
-   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"
+ CFLAGS="$ac_save_CFLAGS"
+@@ -37731,7 +37466,7 @@
+ 	eval "ac_cv_lib_jpeg_normal=no"
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -34051,11 +37253,11 @@
- 
- if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-   LIBJPEG="$ac_cv_lib_jpeg_normal"
--  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
--echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
-+  { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
-        LIBJPEG=
- 
-@@ -34075,7 +37277,7 @@
+ CFLAGS="$ac_save_CFLAGS"
+@@ -37765,7 +37500,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 34078: $i/$j" >&5
-+    echo "configure: 37280: $i/$j" >&5
+-    echo "configure: 37768: $i/$j" >&5
++    echo "configure: 37503: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -34153,8 +37355,8 @@
-   if test -z "$PKG_CONFIG"; then
-     # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -34169,28 +37371,29 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-   ;;
- esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
--
- if test -n "$PKG_CONFIG"; then
--  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
--echo "${ECHO_T}$PKG_CONFIG" >&6
-+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+echo "${ECHO_T}$PKG_CONFIG" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
-+
-   fi
- 
-   if test "$PKG_CONFIG" = "no" ; then
-@@ -34201,25 +37404,25 @@
-   else
-      PKG_CONFIG_MIN_VERSION=0.9.0
-      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
--        echo "$as_me:$LINENO: checking for libexif >= 0.6.12 " >&5
--echo $ECHO_N "checking for libexif >= 0.6.12 ... $ECHO_C" >&6
-+        { echo "$as_me:$LINENO: checking for libexif >= 0.6.12 " >&5
-+echo $ECHO_N "checking for libexif >= 0.6.12 ... $ECHO_C" >&6; }
- 
-         if $PKG_CONFIG --exists "libexif >= 0.6.12 " ; then
--            echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+            { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-             succeeded=yes
- 
--            echo "$as_me:$LINENO: checking LIBEXIF_CFLAGS" >&5
--echo $ECHO_N "checking LIBEXIF_CFLAGS... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking LIBEXIF_CFLAGS" >&5
-+echo $ECHO_N "checking LIBEXIF_CFLAGS... $ECHO_C" >&6; }
-             LIBEXIF_CFLAGS=`$PKG_CONFIG --cflags "libexif >= 0.6.12 "`
--            echo "$as_me:$LINENO: result: $LIBEXIF_CFLAGS" >&5
--echo "${ECHO_T}$LIBEXIF_CFLAGS" >&6
-+            { echo "$as_me:$LINENO: result: $LIBEXIF_CFLAGS" >&5
-+echo "${ECHO_T}$LIBEXIF_CFLAGS" >&6; }
- 
--            echo "$as_me:$LINENO: checking LIBEXIF_LIBS" >&5
--echo $ECHO_N "checking LIBEXIF_LIBS... $ECHO_C" >&6
-+            { echo "$as_me:$LINENO: checking LIBEXIF_LIBS" >&5
-+echo $ECHO_N "checking LIBEXIF_LIBS... $ECHO_C" >&6; }
-             LIBEXIF_LIBS=`$PKG_CONFIG --libs "libexif >= 0.6.12 "`
--            echo "$as_me:$LINENO: result: $LIBEXIF_LIBS" >&5
--echo "${ECHO_T}$LIBEXIF_LIBS" >&6
-+            { echo "$as_me:$LINENO: result: $LIBEXIF_LIBS" >&5
-+echo "${ECHO_T}$LIBEXIF_LIBS" >&6; }
-         else
-             LIBEXIF_CFLAGS=""
-             LIBEXIF_LIBS=""
-@@ -34252,11 +37455,10 @@
- #---------------------------------------------------------
- # libexif detection
- #---------------------------------------------------------
--echo "$as_me:$LINENO: checking if C++ program with exif can be compiled" >&5
--echo $ECHO_N "checking if C++ program with exif can be compiled... $ECHO_C" >&6
--
-+{ echo "$as_me:$LINENO: checking if C++ program with exif can be compiled" >&5
-+echo $ECHO_N "checking if C++ program with exif can be compiled... $ECHO_C" >&6; }
- 
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -34296,23 +37498,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -34321,14 +37536,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--exif_build=no
-+	exif_build=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
--echo "$as_me:$LINENO: result: $exif_build" >&5
--echo "${ECHO_T}$exif_build" >&6
-+{ echo "$as_me:$LINENO: result: $exif_build" >&5
-+echo "${ECHO_T}$exif_build" >&6; }
- if test "$exif_build" = "no"; then
-     LIBEXIF=""
- fi
-@@ -34373,10 +37589,9 @@
- 
- 
- 
--# Check whether --with-libwv2 or --without-libwv2 was given.
-+# Check whether --with-libwv2 was given.
- if test "${with_libwv2+set}" = set; then
--  withval="$with_libwv2"
--
-+  withval=$with_libwv2;
- 	if  test "x$withval" != "xno" ; then
- 		if  test "x$withval" != "xyes" ; then
- 			WV2_DIR=$withval
-@@ -34389,19 +37604,20 @@
- else
-   	search_for_wv2=yes
- 
--fi;
-+fi
-+
- 
- if  test $search_for_wv2 != no ; then
- 	if  test -n "$WV2_DIR" ; then
- 
--   echo "$as_me:$LINENO: checking for wv2-config" >&5
--echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for wv2-config" >&5
-+echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6; }
-    if test -n "$WV2_CONFIG"; then
-         kde_cv_path="$WV2_CONFIG";
-    else
-         kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -34444,29 +37660,29 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
- 		  { echo "$as_me:$LINENO: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&5
- echo "$as_me: WARNING: Could not find libwv2, check http://www.sourceforge.net/projects/wvware/" >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       WV2_CONFIG=$kde_cv_path
- 
-    fi
- 
- 	else
- 
--   echo "$as_me:$LINENO: checking for wv2-config" >&5
--echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for wv2-config" >&5
-+echo $ECHO_N "checking for wv2-config... $ECHO_C" >&6; }
-    if test -n "$WV2_CONFIG"; then
-         kde_cv_path="$WV2_CONFIG";
-    else
-         kde_cache=`echo wv2-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -34509,15 +37725,15 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
- 		  { echo "$as_me:$LINENO: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&5
- echo "$as_me: WARNING: Could not find libwv2 anywhere, check http://www.sourceforge.net/projects/wvware/" >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       WV2_CONFIG=$kde_cv_path
- 
-    fi
-@@ -34529,7 +37745,8 @@
+@@ -38343,7 +38078,8 @@
    vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
    if test -n "$vers" && test "$vers" -ge 1009
    then
@@ -36297,22080 +16618,2605 @@
       LIBWV2_RPATH=
       for args in $LIBWV2_LIBS; do
  	  case $args in
-@@ -34576,9 +37793,9 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
--echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -34600,23 +37817,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -34625,12 +37855,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+@@ -38548,7 +38284,7 @@
  
--eval "$as_ac_Header=no"
-+	eval "$as_ac_Header=no"
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -34642,13 +37874,12 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -34656,124 +37887,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.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' dir; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_search_opendir="-l$ac_lib"
--break
-+  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 \
--      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
--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
--  echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -34781,120 +37987,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.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' x; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_search_opendir="-l$ac_lib"
--break
-+  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 \
--      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
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
--  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
- fi
- 
- fi
- 
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -34918,23 +38100,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -34943,8 +38138,9 @@
-   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
- 
- if test $ac_cv_header_stdc = yes; then
-@@ -35001,6 +38197,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -35020,18 +38217,27 @@
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35044,12 +38250,14 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -35064,9 +38272,9 @@
- for ac_func in rewinddir popen mkstemp
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -35092,52 +38300,59 @@
- 
- #undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35146,13 +38361,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 \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -35162,15 +38379,15 @@
- done
- 
- 
--# Check whether --enable-largefile or --disable-largefile was given.
-+# Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then
--  enableval="$enable_largefile"
-+  enableval=$enable_largefile;
-+fi
- 
--fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
--echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
-+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -35178,8 +38395,8 @@
-      if test "$GCC" != yes; then
-        ac_save_CC=$CC
-        while :; do
--     	 # IRIX 6.2 and later do not support large files by default,
--     	 # so use the C compiler's -n32 option if that helps.
-+	 # IRIX 6.2 and later do not support large files by default,
-+	 # so use the C compiler's -n32 option if that helps.
- 	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -35203,24 +38420,37 @@
-   return 0;
- }
- _ACEOF
--     	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+	 rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35229,27 +38459,42 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext
--     	 CC="$CC -n32"
--     	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+	 CC="$CC -n32"
-+	 rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35258,7 +38503,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext
- 	 break
-        done
-@@ -35266,14 +38513,14 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
--echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
--echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -35303,23 +38550,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35328,7 +38588,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -35355,23 +38617,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35380,13 +38655,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_opendir+set}" = set; then
    break
- done
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
--echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
- if test "$ac_cv_sys_file_offset_bits" != no; then
+@@ -38648,7 +38384,7 @@
  
- cat >>confdefs.h <<_ACEOF
-@@ -35395,8 +38672,8 @@
- 
  fi
- rm -f conftest*
--  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
--echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -35426,23 +38703,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35451,7 +38741,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -35478,23 +38770,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35503,13 +38808,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext
+   if test "${ac_cv_search_opendir+set}" = set; then
    break
- done
+@@ -38961,7 +38697,7 @@
+ 	eval "$as_ac_var=no"
  fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
--echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
-+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
- if test "$ac_cv_sys_large_files" != no; then
  
- cat >>confdefs.h <<_ACEOF
-@@ -35520,8 +38827,8 @@
- rm -f conftest*
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
  fi
- 
--echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
--echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -35543,23 +38850,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35568,7 +38888,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -39627,7 +39363,7 @@
+ 	ac_cv_func_fseeko=no
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -35587,23 +38909,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35612,13 +38947,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  
-+
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-   break
- done
+ { echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
+@@ -39736,7 +39472,7 @@
+ 	eval "$as_ac_var=no"
  fi
--echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
--echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
-+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
- if test "$ac_cv_sys_largefile_source" != no; then
  
- cat >>confdefs.h <<_ACEOF
-@@ -35631,8 +38968,8 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:$LINENO: checking for fseeko" >&5
--echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for fseeko" >&5
-+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6; }
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -35652,23 +38989,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35677,13 +39027,14 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_fseeko=no
-+	ac_cv_func_fseeko=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
--echo "${ECHO_T}$ac_cv_func_fseeko" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
-+echo "${ECHO_T}$ac_cv_func_fseeko" >&6; }
- if test $ac_cv_func_fseeko = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -35696,9 +39047,9 @@
- for ac_func in fseek64
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -35724,52 +39075,59 @@
- 
- #undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35778,13 +39136,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
-+	eval "$as_ac_var=no"
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -39846,7 +39582,7 @@
+ 	eval "$as_ac_var=no"
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -35797,9 +39157,9 @@
- for ac_func in ftell64
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -35825,52 +39185,59 @@
  
- #undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35879,13 +39246,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -35900,10 +39269,9 @@
- 
- 
- 
--
-    kde_safe_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $all_includes"
--    ac_ext=cc
-+    ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35916,18 +39284,19 @@
- for ac_header in paper.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -40129,7 +39865,7 @@
+ 	ac_cv_lib_paper_paperinit=no
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -35938,23 +39307,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -35963,15 +39345,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -35980,8 +39363,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -36005,9 +39393,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -36031,25 +39420,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36078,8 +39461,8 @@
- 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
- 	;;
-      esac
--     echo "$as_me:$LINENO: checking for paperinit in -lpaper" >&5
--echo $ECHO_N "checking for paperinit in -lpaper... $ECHO_C" >&6
-+     { echo "$as_me:$LINENO: checking for paperinit in -lpaper" >&5
-+echo $ECHO_N "checking for paperinit in -lpaper... $ECHO_C" >&6; }
- if test "${ac_cv_lib_paper_paperinit+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -36092,39 +39475,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char paperinit ();
- int
- main ()
- {
--paperinit ();
-+return paperinit ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -36133,14 +39529,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_paper_paperinit=no
-+	ac_cv_lib_paper_paperinit=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_paper_paperinit" >&5
--echo "${ECHO_T}$ac_cv_lib_paper_paperinit" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_paper_paperinit" >&5
-+echo "${ECHO_T}$ac_cv_lib_paper_paperinit" >&6; }
- if test $ac_cv_lib_paper_paperinit = yes; then
-   LIBPAPER="-lpaper"
- fi
-@@ -36151,14 +39548,14 @@
- 
- 
- 
--   echo "$as_me:$LINENO: checking for pkg-config" >&5
--echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
-    if test -n "$PKGCONFIG"; then
-         kde_cv_path="$PKGCONFIG";
-    else
-         kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36201,15 +39598,15 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-   { echo "$as_me:$LINENO: WARNING: Could not find pkg-config" >&5
- echo "$as_me: WARNING: Could not find pkg-config" >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       PKGCONFIG=$kde_cv_path
- 
-    fi
-@@ -36258,14 +39655,14 @@
- 
- 
- 
--   echo "$as_me:$LINENO: checking for xml2-config" >&5
--echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for xml2-config" >&5
-+echo $ECHO_N "checking for xml2-config... $ECHO_C" >&6; }
-    if test -n "$XML_CONFIG"; then
-         kde_cv_path="$XML_CONFIG";
-    else
-         kde_cache=`echo xml2-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36308,16 +39705,16 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-   { echo "$as_me:$LINENO: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
- echo "$as_me: WARNING: Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-   HELP_SUBDIR=
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       XML_CONFIG=$kde_cv_path
- 
-    fi
-@@ -36340,14 +39737,14 @@
-      LIBXML_CFLAGS="`$XML_CONFIG --cflags`"
- 
- 
--   echo "$as_me:$LINENO: checking for xmllint" >&5
--echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for xmllint" >&5
-+echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; }
-    if test -n "$XMLLINT"; then
-         kde_cv_path="$XMLLINT";
-    else
-         kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36390,12 +39787,12 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-       XMLLINT=""
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       XMLLINT=$kde_cv_path
- 
-    fi
-@@ -36413,14 +39810,14 @@
- fi
- 
- 
--   echo "$as_me:$LINENO: checking for xslt-config" >&5
--echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for xslt-config" >&5
-+echo $ECHO_N "checking for xslt-config... $ECHO_C" >&6; }
-    if test -n "$XSLT_CONFIG"; then
-         kde_cv_path="$XSLT_CONFIG";
-    else
-         kde_cache=`echo xslt-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36463,16 +39860,16 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-   { echo "$as_me:$LINENO: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&5
- echo "$as_me: WARNING: Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)" >&2;}
-   HELP_SUBDIR=
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       XSLT_CONFIG=$kde_cv_path
- 
-    fi
-@@ -36526,14 +39923,14 @@
- 
- 
- 
--   echo "$as_me:$LINENO: checking for freetype-config" >&5
--echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for freetype-config" >&5
-+echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
-    if test -n "$FREETYPE_CONFIG"; then
-         kde_cv_path="$FREETYPE_CONFIG";
-    else
-         kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36576,15 +39973,15 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-   { echo "$as_me:$LINENO: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&5
- echo "$as_me: WARNING: Could not find libfreetype anywhere, check http://www.freetype.org/" >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       FREETYPE_CONFIG=$kde_cv_path
- 
-    fi
-@@ -36617,14 +40014,14 @@
- 
- 
- 
--   echo "$as_me:$LINENO: checking for libart2-config" >&5
--echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for libart2-config" >&5
-+echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6; }
-    if test -n "$LIBART_CONFIG"; then
-         kde_cv_path="$LIBART_CONFIG";
-    else
-         kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36667,15 +40064,15 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-   { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
- echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       LIBART_CONFIG=$kde_cv_path
- 
-    fi
-@@ -36715,14 +40112,14 @@
- 
- # Check for fontconfig
- 
--   echo "$as_me:$LINENO: checking for fontconfig-config" >&5
--echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
-+echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
-    if test -n "$FONTCONFIG_CONFIG"; then
-         kde_cv_path="$FONTCONFIG_CONFIG";
-    else
-         kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36765,18 +40162,18 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
- 
--   echo "$as_me:$LINENO: checking for pkg-config" >&5
--echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for pkg-config" >&5
-+echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6; }
-    if test -n "$PKGCONFIG"; then
-         kde_cv_path="$PKGCONFIG";
-    else
-         kde_cache=`echo pkg-config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -36819,23 +40216,23 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-             { echo "$as_me:$LINENO: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&5
- echo "$as_me: WARNING: Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ " >&2;}
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       PKGCONFIG=$kde_cv_path
- 
-    fi
- 
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       FONTCONFIG_CONFIG=$kde_cv_path
- 
-    fi
-@@ -36908,8 +40305,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for Readline library" >&5
--echo $ECHO_N "checking for Readline library... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Readline library" >&5
-+echo $ECHO_N "checking for Readline library... $ECHO_C" >&6; }
- 
- kexi_cv_lib_readline=no
- ac_save_LIBS="$LIBS"
-@@ -36947,13 +40344,22 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -36972,9 +40378,11 @@
- 	kexi_cv_lib_readline=no
- 
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-+
-+
- 	if test "$kexi_cv_lib_readline" = yes ; then break ; fi
- done
- # restore LIBS
-@@ -36982,11 +40390,11 @@
- 
- if test "$kexi_cv_lib_readline" = no ; then
- 	LIBREADLINE=""
--	echo "$as_me:$LINENO: result: \"not found - kexisql will not be compiled\"" >&5
--echo "${ECHO_T}\"not found - kexisql will not be compiled\"" >&6
-+	{ echo "$as_me:$LINENO: result: \"not found - kexisql will not be compiled\"" >&5
-+echo "${ECHO_T}\"not found - kexisql will not be compiled\"" >&6; }
- else
--	echo "$as_me:$LINENO: result: $LIBREADLINE" >&5
--echo "${ECHO_T}$LIBREADLINE" >&6
-+	{ echo "$as_me:$LINENO: result: $LIBREADLINE" >&5
-+echo "${ECHO_T}$LIBREADLINE" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_READLINE 1
-@@ -37016,13 +40424,13 @@
- 
- 
- 
--# Check whether --enable-mysql or --disable-mysql was given.
-+# Check whether --enable-mysql was given.
- if test "${enable_mysql+set}" = set; then
--  enableval="$enable_mysql"
--  mysql_plugin=$enableval
-+  enableval=$enable_mysql; mysql_plugin=$enableval
- else
-   mysql_plugin=yes
--fi;
-+fi
-+
- 
- if test "x$mysql_plugin" = "xyes"; then
-   compile_mysql_plugin="yes"
-@@ -37031,37 +40439,37 @@
- fi
- 
- 
--# Check whether --with-mysql_includes or --without-mysql_includes was given.
-+# Check whether --with-mysql_includes was given.
- if test "${with_mysql_includes+set}" = set; then
--  withval="$with_mysql_includes"
--
-+  withval=$with_mysql_includes;
-   ac_mysql_incdir=$withval
- 
- else
-   ac_mysql_incdir=
- 
--fi;
-+fi
- 
- 
--# Check whether --with-mysql_libraries or --without-mysql_libraries was given.
--if test "${with_mysql_libraries+set}" = set; then
--  withval="$with_mysql_libraries"
- 
-+# Check whether --with-mysql_libraries was given.
-+if test "${with_mysql_libraries+set}" = set; then
-+  withval=$with_mysql_libraries;
-   ac_mysql_libdir=$withval
- 
- else
-   ac_mysql_libdir=
- 
--fi;
-+fi
-+
- 
- 
--echo "$as_me:$LINENO: checking for MySQL" >&5
--echo $ECHO_N "checking for MySQL... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for MySQL" >&5
-+echo $ECHO_N "checking for MySQL... $ECHO_C" >&6; }
- 
- if test "$compile_mysql_plugin" = "yes"; then
-   if test -n "$ac_mysql_incdir" -o -n "$ac_mysql_libdir"; then
--    echo "$as_me:$LINENO: checking for MySQL headers" >&5
--echo $ECHO_N "checking for MySQL headers... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for MySQL headers" >&5
-+echo $ECHO_N "checking for MySQL headers... $ECHO_C" >&6; }
-     mysql_incdirs="$ac_mysql_incdir /usr/local/include /usr/include"
- 
- mysql_incdir=NO
-@@ -37069,7 +40477,7 @@
+@@ -41074,7 +40810,7 @@
  do
    for j in mysql/mysql.h;
    do
--    echo "configure: 37072: $i/$j" >&5
-+    echo "configure: 40480: $i/$j" >&5
+-    echo "configure: 41077: $i/$j" >&5
++    echo "configure: 40813: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        mysql_incdir=$i
-@@ -37080,17 +40488,17 @@
- 
-     if test -r $mysql_incdir/mysql/mysql.h; then
-       MYSQL_INC=$mysql_incdir
--      echo "$as_me:$LINENO: result: $MYSQL_INC" >&5
--echo "${ECHO_T}$MYSQL_INC" >&6
-+      { echo "$as_me:$LINENO: result: $MYSQL_INC" >&5
-+echo "${ECHO_T}$MYSQL_INC" >&6; }
- 
-     else
-       compile_mysql_plugin="no"
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-     fi
- 
--    echo "$as_me:$LINENO: checking for MySQL libraries" >&5
--echo $ECHO_N "checking for MySQL libraries... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for MySQL libraries" >&5
-+echo $ECHO_N "checking for MySQL libraries... $ECHO_C" >&6; }
-     mysql_libdirs="$ac_mysql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
- 
- mysql_libdir=NO
-@@ -37098,7 +40506,7 @@
+@@ -41103,7 +40839,7 @@
  do
    for j in mysql/libmysqlclient.so;
    do
--    echo "configure: 37101: $i/$j" >&5
-+    echo "configure: 40509: $i/$j" >&5
+-    echo "configure: 41106: $i/$j" >&5
++    echo "configure: 40842: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        mysql_libdir=$i
-@@ -37109,24 +40517,24 @@
- 
-     if test -r $mysql_libdir/mysql/libmysqlclient.so; then
-       MYSQL_LIBS=$mysql_libdir
--      echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5
--echo "${ECHO_T}$MYSQL_LIBS" >&6
-+      { echo "$as_me:$LINENO: result: $MYSQL_LIBS" >&5
-+echo "${ECHO_T}$MYSQL_LIBS" >&6; }
- 
-     else
-       compile_mysql_plugin="no"
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-     fi
-   else
- 
--   echo "$as_me:$LINENO: checking for mysql_config" >&5
--echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for mysql_config" >&5
-+echo $ECHO_N "checking for mysql_config... $ECHO_C" >&6; }
-    if test -n "$MYSQL_CONFIG"; then
-         kde_cv_path="$MYSQL_CONFIG";
-    else
-         kde_cache=`echo mysql_config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -37169,15 +40577,15 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       MYSQL_CONFIG=$kde_cv_path
- 
-    fi
-@@ -37191,8 +40599,8 @@
- 
- 
-       compile_mypsql_plugin="yes"
--      echo "$as_me:$LINENO: result: headers $mysql_incdir, libraries $mysql_libdir" >&5
--echo "${ECHO_T}headers $mysql_incdir, libraries $mysql_libdir" >&6
-+      { echo "$as_me:$LINENO: result: headers $mysql_incdir, libraries $mysql_libdir" >&5
-+echo "${ECHO_T}headers $mysql_incdir, libraries $mysql_libdir" >&6; }
-     else
-       compile_mysql_plugin="no"
-     fi
-@@ -37215,13 +40623,13 @@
- 
- 
- 
--# Check whether --enable-pgsql or --disable-pgsql was given.
-+# Check whether --enable-pgsql was given.
- if test "${enable_pgsql+set}" = set; then
--  enableval="$enable_pgsql"
--  pgsql_plugin=$enableval
-+  enableval=$enable_pgsql; pgsql_plugin=$enableval
- else
-   pgsql_plugin=yes
--fi;
-+fi
-+
- 
- if test "x$pgsql_plugin" = "xyes"; then
-   compile_pgsql_plugin="yes"
-@@ -37230,35 +40638,35 @@
- fi
- 
- 
--# Check whether --with-pgsql-includes or --without-pgsql-includes was given.
-+# Check whether --with-pgsql-includes was given.
- if test "${with_pgsql_includes+set}" = set; then
--  withval="$with_pgsql_includes"
--
-+  withval=$with_pgsql_includes;
-   ac_pgsql_incdir=$withval
- 
- else
-   ac_pgsql_incdir=
- 
--fi;
-+fi
- 
- 
--# Check whether --with-pgsql-libraries or --without-pgsql-libraries was given.
--if test "${with_pgsql_libraries+set}" = set; then
--  withval="$with_pgsql_libraries"
- 
-+# Check whether --with-pgsql-libraries was given.
-+if test "${with_pgsql_libraries+set}" = set; then
-+  withval=$with_pgsql_libraries;
-   ac_pgsql_libdir=$withval
- 
- else
-   ac_pgsql_libdir=
- 
--fi;
-+fi
-+
- 
- 
- 
- if test "$compile_pgsql_plugin" = "yes"; then
-   if test -n "$ac_pgsql_incdir" -o -n "$ac_pgsql_libdir"; then
--    echo "$as_me:$LINENO: checking for PostgreSQL C API headers" >&5
--echo $ECHO_N "checking for PostgreSQL C API headers... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for PostgreSQL C API headers" >&5
-+echo $ECHO_N "checking for PostgreSQL C API headers... $ECHO_C" >&6; }
-     pgsql_incdirs="$ac_pgsql_incdir /usr/local/include /usr/include"
- 
- pgsql_incdir=NO
-@@ -37266,7 +40674,7 @@
+@@ -41271,7 +41007,7 @@
  do
    for j in libpq-fe.h;
    do
--    echo "configure: 37269: $i/$j" >&5
-+    echo "configure: 40677: $i/$j" >&5
+-    echo "configure: 41274: $i/$j" >&5
++    echo "configure: 41010: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        pgsql_incdir=$i
-@@ -37277,17 +40685,17 @@
- 
-     if test -r $pgsql_incdir/libpq-fe.h; then
-       PG_INCDIR=$pgsql_incdir
--      echo "$as_me:$LINENO: result: $PG_INCDIR" >&5
--echo "${ECHO_T}$PG_INCDIR" >&6
-+      { echo "$as_me:$LINENO: result: $PG_INCDIR" >&5
-+echo "${ECHO_T}$PG_INCDIR" >&6; }
- 
-     else
-       compile_pgsql_plugin="no"
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-     fi
- 
--    echo "$as_me:$LINENO: checking for PostgreSQL C API libraries" >&5
--echo $ECHO_N "checking for PostgreSQL C API libraries... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for PostgreSQL C API libraries" >&5
-+echo $ECHO_N "checking for PostgreSQL C API libraries... $ECHO_C" >&6; }
-     pgsql_libdirs="$ac_pgsql_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
- 
- pgsql_libdir=NO
-@@ -37295,7 +40703,7 @@
+@@ -41300,7 +41036,7 @@
  do
    for j in libpq.so;
    do
--    echo "configure: 37298: $i/$j" >&5
-+    echo "configure: 40706: $i/$j" >&5
+-    echo "configure: 41303: $i/$j" >&5
++    echo "configure: 41039: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        pgsql_libdir=$i
-@@ -37306,24 +40714,24 @@
- 
-     if test -r $pgsql_libdir/libpq.so; then
-       PG_LIBDIR=$pgsql_libdir
--      echo "$as_me:$LINENO: result: $PG_LIBDIR" >&5
--echo "${ECHO_T}$PG_LIBDIR" >&6
-+      { echo "$as_me:$LINENO: result: $PG_LIBDIR" >&5
-+echo "${ECHO_T}$PG_LIBDIR" >&6; }
- 
-     else
-       compile_pgsql_plugin="no"
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-     fi
-   else
- 
--   echo "$as_me:$LINENO: checking for pg_config" >&5
--echo $ECHO_N "checking for pg_config... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for pg_config" >&5
-+echo $ECHO_N "checking for pg_config... $ECHO_C" >&6; }
-    if test -n "$PG_CONFIG"; then
-         kde_cv_path="$PG_CONFIG";
-    else
-         kde_cache=`echo pg_config | sed 'y%./+-%__p_%'`
- 
--        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-+        if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-@@ -37366,15 +40774,15 @@
-    fi
- 
-    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
- 
-    else
--      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
--echo "${ECHO_T}$kde_cv_path" >&6
-+      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-+echo "${ECHO_T}$kde_cv_path" >&6; }
-       PG_CONFIG=$kde_cv_path
- 
-    fi
-@@ -37387,8 +40795,8 @@
-       PG_LIBDIR=$pgsql_libdir
- 
-       compile_pgsql_plugin="yes"
--      echo "$as_me:$LINENO: result: headers $pgsql_incdir, libraries $pgsql_libdir" >&5
--echo "${ECHO_T}headers $pgsql_incdir, libraries $pgsql_libdir" >&6
-+      { echo "$as_me:$LINENO: result: headers $pgsql_incdir, libraries $pgsql_libdir" >&5
-+echo "${ECHO_T}headers $pgsql_incdir, libraries $pgsql_libdir" >&6; }
-     else
-       compile_pgsql_plugin="no"
-     fi
-@@ -37412,33 +40820,33 @@
- 
- 
- 
--# Check whether --with-pqxx-includes or --without-pqxx-includes was given.
-+# Check whether --with-pqxx-includes was given.
- if test "${with_pqxx_includes+set}" = set; then
--  withval="$with_pqxx_includes"
--
-+  withval=$with_pqxx_includes;
-   ac_pqxx_incdir=$withval
- 
- else
-   ac_pqxx_incdir=
- 
--fi;
-+fi
- 
- 
--# Check whether --with-pqxx-libraries or --without-pqxx-libraries was given.
--if test "${with_pqxx_libraries+set}" = set; then
--  withval="$with_pqxx_libraries"
- 
-+# Check whether --with-pqxx-libraries was given.
-+if test "${with_pqxx_libraries+set}" = set; then
-+  withval=$with_pqxx_libraries;
-   ac_pqxx_libdir=$withval
- 
- else
-   ac_pqxx_libdir=
- 
--fi;
-+fi
-+
- 
- 
- if test "$compile_pgsql_plugin" = "yes"; then
--  echo "$as_me:$LINENO: checking for PostgreSQL C++ includes" >&5
--echo $ECHO_N "checking for PostgreSQL C++ includes... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for PostgreSQL C++ includes" >&5
-+echo $ECHO_N "checking for PostgreSQL C++ includes... $ECHO_C" >&6; }
-   pqxx_incdirs="$ac_pqxx_incdir /usr/local/include /usr/include"
- 
- pqxx_incdir=NO
-@@ -37446,7 +40854,7 @@
+@@ -41451,7 +41187,7 @@
  do
    for j in pqxx/pqxx;
    do
--    echo "configure: 37449: $i/$j" >&5
-+    echo "configure: 40857: $i/$j" >&5
+-    echo "configure: 41454: $i/$j" >&5
++    echo "configure: 41190: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        pqxx_incdir=$i
-@@ -37457,19 +40865,19 @@
- 
-   if test -r $pqxx_incdir/pqxx/pqxx; then
-     PQXX_INCDIR=$pqxx_incdir
--    echo "$as_me:$LINENO: result: $PQXX_INCDIR" >&5
--echo "${ECHO_T}$PQXX_INCDIR" >&6
-+    { echo "$as_me:$LINENO: result: $PQXX_INCDIR" >&5
-+echo "${ECHO_T}$PQXX_INCDIR" >&6; }
- 
-   else
-     compile_pgsql_plugin="no"
--    echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+    { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-   fi
- fi
- 
- if test "$compile_pgsql_plugin" = "yes"; then
--  echo "$as_me:$LINENO: checking for PostgreSQL C++ libraries" >&5
--echo $ECHO_N "checking for PostgreSQL C++ libraries... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for PostgreSQL C++ libraries" >&5
-+echo $ECHO_N "checking for PostgreSQL C++ libraries... $ECHO_C" >&6; }
-   pqxx_libdirs="$ac_pqxx_libdir /usr/local/lib$kdelibsuff /usr/lib$kdelibsuff"
- 
- pqxx_libdir=NO
-@@ -37477,7 +40885,7 @@
+@@ -41482,7 +41218,7 @@
  do
    for j in libpqxx.so;
    do
--    echo "configure: 37480: $i/$j" >&5
-+    echo "configure: 40888: $i/$j" >&5
+-    echo "configure: 41485: $i/$j" >&5
++    echo "configure: 41221: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        pqxx_libdir=$i
-@@ -37488,13 +40896,13 @@
- 
-   if test -r $pqxx_libdir/libpqxx.so; then
-     PQXX_LIBDIR=$pqxx_libdir
--    echo "$as_me:$LINENO: result: $PQXX_LIBDIR" >&5
--echo "${ECHO_T}$PQXX_LIBDIR" >&6
-+    { echo "$as_me:$LINENO: result: $PQXX_LIBDIR" >&5
-+echo "${ECHO_T}$PQXX_LIBDIR" >&6; }
- 
-   else
-     compile_pgsql_plugin="no"
--    echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+    { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-   fi
- fi
- 
-@@ -37511,8 +40919,8 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for KDE library: knewstuff" >&5
--echo $ECHO_N "checking for KDE library: knewstuff... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE library: knewstuff" >&5
-+echo $ECHO_N "checking for KDE library: knewstuff... $ECHO_C" >&6; }
- 
- ac_knewstuff_includes=NO ac_knewstuff_libraries=NO
- knewstuff_libraries=""
-@@ -37528,7 +40936,7 @@
+@@ -41533,7 +41269,7 @@
  do
    for j in knewstuff/downloaddialog.h;
    do
--    echo "configure: 37531: $i/$j" >&5
-+    echo "configure: 40939: $i/$j" >&5
+-    echo "configure: 41536: $i/$j" >&5
++    echo "configure: 41272: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        knewstuff_incdir=$i
-@@ -37545,7 +40953,7 @@
+@@ -41550,7 +41286,7 @@
  do
    for j in libknewstuff.so;
    do
--    echo "configure: 37548: $i/$j" >&5
-+    echo "configure: 40956: $i/$j" >&5
+-    echo "configure: 41553: $i/$j" >&5
++    echo "configure: 41289: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        knewstuff_libdir=$i
-@@ -37569,11 +40977,11 @@
- eval "$ac_cv_have_knewstuff"
- 
- if test "$have_knewstuff" != yes; then
--  echo "$as_me:$LINENO: result: $have_knewstuff" >&5
--echo "${ECHO_T}$have_knewstuff" >&6
-+  { echo "$as_me:$LINENO: result: $have_knewstuff" >&5
-+echo "${ECHO_T}$have_knewstuff" >&6; }
- else
--  echo "$as_me:$LINENO: result: $have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&5
--echo "${ECHO_T}$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&6
-+  { echo "$as_me:$LINENO: result: $have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&5
-+echo "${ECHO_T}$have_knewstuff (libraries $ac_knewstuff_libraries, headers $ac_knewstuff_includes)" >&6; }
- 
-   CXXFLAGS="$CXXFLAGS -DHAVE_KNEWSTUFF"
- 
-@@ -37581,8 +40989,8 @@
- 
- fi
- 
--echo "$as_me:$LINENO: checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp" >&5
--echo $ECHO_N "checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp" >&5
-+echo $ECHO_N "checking for kexi/3rdparty/kexifeedbackwizard/lib/kexifeedbackwizard.cpp... $ECHO_C" >&6; }
- if test "${ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -37596,8 +41004,8 @@
-   ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp=no
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&5
--echo "${ECHO_T}$ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&5
-+echo "${ECHO_T}$ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp" >&6; }
- if test $ac_cv_file_kexi_3rdparty_kexifeedbackwizard_lib_kexifeedbackwizard_cpp = yes; then
-   have_internal_feedback="yes"
- 
-@@ -37607,8 +41015,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking for KDE library: kfeedbackwizard" >&5
--echo $ECHO_N "checking for KDE library: kfeedbackwizard... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for KDE library: kfeedbackwizard" >&5
-+echo $ECHO_N "checking for KDE library: kfeedbackwizard... $ECHO_C" >&6; }
- 
- ac_kfeedback_includes=NO ac_kfeedback_libraries=NO
- kfeedback_libraries=""
-@@ -37624,7 +41032,7 @@
+@@ -41629,7 +41365,7 @@
  do
    for j in kfeedbackwizard.h;
    do
--    echo "configure: 37627: $i/$j" >&5
-+    echo "configure: 41035: $i/$j" >&5
+-    echo "configure: 41632: $i/$j" >&5
++    echo "configure: 41368: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kfeedback_incdir=$i
-@@ -37641,7 +41049,7 @@
+@@ -41646,7 +41382,7 @@
  do
    for j in libkfeedbackwizard.so;
    do
--    echo "configure: 37644: $i/$j" >&5
-+    echo "configure: 41052: $i/$j" >&5
+-    echo "configure: 41649: $i/$j" >&5
++    echo "configure: 41385: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kfeedback_libdir=$i
-@@ -37670,19 +41078,19 @@
-   if test "$have_internal_feedback" = yes; then
-     CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KexiFeedbackWizard -DFEEDBACK_INCLUDE=\"<kexifeedbackwizard.h>\""
-     use_kexifb="yes"
--    echo "$as_me:$LINENO: result: using internal" >&5
--echo "${ECHO_T}using internal" >&6
-+    { echo "$as_me:$LINENO: result: using internal" >&5
-+echo "${ECHO_T}using internal" >&6; }
-     INC_KFEEDBACK='-I../3rdparty/kexifeedbackwizard/lib'
-     LIB_KFEEDBACK='../3rdparty/kexifeedbackwizard/lib/libkexifeedbackwizard.la'
-   else
-     use_kexifb="no"
--    echo "$as_me:$LINENO: result: dont use" >&5
--echo "${ECHO_T}dont use" >&6
-+    { echo "$as_me:$LINENO: result: dont use" >&5
-+echo "${ECHO_T}dont use" >&6; }
-   fi
- else
-   use_kexifb="no"
--  echo "$as_me:$LINENO: result: $have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&5
--echo "${ECHO_T}$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&6
-+  { echo "$as_me:$LINENO: result: $have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&5
-+echo "${ECHO_T}$have_kfeedback (libraries $ac_kfeedback_libraries, headers $ac_kfeedback_includes)" >&6; }
- 
-   CXXFLAGS="$CXXFLAGS -DFEEDBACK_CLASS=KFeedbackWizard -DFEEDBACK_INCLUDE=\"<kfeedbackwizard.h>\""
- 
-@@ -37721,8 +41129,8 @@
- #fi
- 
- 
--echo "$as_me:$LINENO: checking for Python directory" >&5
--echo $ECHO_N "checking for Python directory... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python directory" >&5
-+echo $ECHO_N "checking for Python directory... $ECHO_C" >&6; }
- 
- if test "${kde_cv_pythondir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -37738,19 +41146,19 @@
- 
- 
- 
--# Check whether --with-pythondir or --without-pythondir was given.
-+# Check whether --with-pythondir was given.
- if test "${with_pythondir+set}" = set; then
--  withval="$with_pythondir"
--
-+  withval=$with_pythondir;
-   ac_python_dir=$withval
- 
- else
-   ac_python_dir=$kde_cv_pythondir
- 
--fi;
-+fi
-+
- 
--echo "$as_me:$LINENO: result: $ac_python_dir" >&5
--echo "${ECHO_T}$ac_python_dir" >&6
-+{ echo "$as_me:$LINENO: result: $ac_python_dir" >&5
-+echo "${ECHO_T}$ac_python_dir" >&6; }
- 
- 
- 
-@@ -37764,8 +41172,8 @@
-   version=""2.4""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -37774,7 +41182,7 @@
+@@ -42186,7 +41922,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 37777: $i/$j" >&5
-+    echo "configure: 41185: $i/$j" >&5
+-    echo "configure: 42189: $i/$j" >&5
++    echo "configure: 41925: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -37790,7 +41198,7 @@
+@@ -42202,7 +41938,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 37793: $i/$j" >&5
-+    echo "configure: 41201: $i/$j" >&5
+-    echo "configure: 42205: $i/$j" >&5
++    echo "configure: 41941: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -37814,7 +41222,7 @@
+@@ -42226,7 +41962,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 37817: $i/$j" >&5
-+    echo "configure: 41225: $i/$j" >&5
+-    echo "configure: 42229: $i/$j" >&5
++    echo "configure: 41965: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -37830,7 +41238,7 @@
+@@ -42242,7 +41978,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 37833: $i/$j" >&5
-+    echo "configure: 41241: $i/$j" >&5
+-    echo "configure: 42245: $i/$j" >&5
++    echo "configure: 41981: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -37846,7 +41254,7 @@
+@@ -42258,7 +41994,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 37849: $i/$j" >&5
-+    echo "configure: 41257: $i/$j" >&5
+-    echo "configure: 42261: $i/$j" >&5
++    echo "configure: 41997: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -37874,7 +41282,7 @@
+@@ -42286,7 +42022,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 37877: $i/$j" >&5
-+    echo "configure: 41285: $i/$j" >&5
+-    echo "configure: 42289: $i/$j" >&5
++    echo "configure: 42025: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -37890,8 +41298,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -37908,8 +41316,8 @@
-   version=""2.3""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -37918,7 +41326,7 @@
+@@ -42330,7 +42066,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 37921: $i/$j" >&5
-+    echo "configure: 41329: $i/$j" >&5
+-    echo "configure: 42333: $i/$j" >&5
++    echo "configure: 42069: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -37934,7 +41342,7 @@
+@@ -42346,7 +42082,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 37937: $i/$j" >&5
-+    echo "configure: 41345: $i/$j" >&5
+-    echo "configure: 42349: $i/$j" >&5
++    echo "configure: 42085: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -37958,7 +41366,7 @@
+@@ -42370,7 +42106,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 37961: $i/$j" >&5
-+    echo "configure: 41369: $i/$j" >&5
+-    echo "configure: 42373: $i/$j" >&5
++    echo "configure: 42109: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -37974,7 +41382,7 @@
+@@ -42386,7 +42122,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 37977: $i/$j" >&5
-+    echo "configure: 41385: $i/$j" >&5
+-    echo "configure: 42389: $i/$j" >&5
++    echo "configure: 42125: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -37990,7 +41398,7 @@
+@@ -42402,7 +42138,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 37993: $i/$j" >&5
-+    echo "configure: 41401: $i/$j" >&5
+-    echo "configure: 42405: $i/$j" >&5
++    echo "configure: 42141: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38018,7 +41426,7 @@
+@@ -42430,7 +42166,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38021: $i/$j" >&5
-+    echo "configure: 41429: $i/$j" >&5
+-    echo "configure: 42433: $i/$j" >&5
++    echo "configure: 42169: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38034,8 +41442,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38052,8 +41460,8 @@
-   version=""2.2""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -38062,7 +41470,7 @@
+@@ -42474,7 +42210,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38065: $i/$j" >&5
-+    echo "configure: 41473: $i/$j" >&5
+-    echo "configure: 42477: $i/$j" >&5
++    echo "configure: 42213: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38078,7 +41486,7 @@
+@@ -42490,7 +42226,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38081: $i/$j" >&5
-+    echo "configure: 41489: $i/$j" >&5
+-    echo "configure: 42493: $i/$j" >&5
++    echo "configure: 42229: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38102,7 +41510,7 @@
+@@ -42514,7 +42250,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38105: $i/$j" >&5
-+    echo "configure: 41513: $i/$j" >&5
+-    echo "configure: 42517: $i/$j" >&5
++    echo "configure: 42253: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38118,7 +41526,7 @@
+@@ -42530,7 +42266,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38121: $i/$j" >&5
-+    echo "configure: 41529: $i/$j" >&5
+-    echo "configure: 42533: $i/$j" >&5
++    echo "configure: 42269: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38134,7 +41542,7 @@
+@@ -42546,7 +42282,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38137: $i/$j" >&5
-+    echo "configure: 41545: $i/$j" >&5
+-    echo "configure: 42549: $i/$j" >&5
++    echo "configure: 42285: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38162,7 +41570,7 @@
+@@ -42574,7 +42310,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38165: $i/$j" >&5
-+    echo "configure: 41573: $i/$j" >&5
+-    echo "configure: 42577: $i/$j" >&5
++    echo "configure: 42313: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38178,8 +41586,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38196,8 +41604,8 @@
-   version=""2.1""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -38206,7 +41614,7 @@
+@@ -42618,7 +42354,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38209: $i/$j" >&5
-+    echo "configure: 41617: $i/$j" >&5
+-    echo "configure: 42621: $i/$j" >&5
++    echo "configure: 42357: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38222,7 +41630,7 @@
+@@ -42634,7 +42370,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38225: $i/$j" >&5
-+    echo "configure: 41633: $i/$j" >&5
+-    echo "configure: 42637: $i/$j" >&5
++    echo "configure: 42373: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38246,7 +41654,7 @@
+@@ -42658,7 +42394,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38249: $i/$j" >&5
-+    echo "configure: 41657: $i/$j" >&5
+-    echo "configure: 42661: $i/$j" >&5
++    echo "configure: 42397: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38262,7 +41670,7 @@
+@@ -42674,7 +42410,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38265: $i/$j" >&5
-+    echo "configure: 41673: $i/$j" >&5
+-    echo "configure: 42677: $i/$j" >&5
++    echo "configure: 42413: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38278,7 +41686,7 @@
+@@ -42690,7 +42426,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38281: $i/$j" >&5
-+    echo "configure: 41689: $i/$j" >&5
+-    echo "configure: 42693: $i/$j" >&5
++    echo "configure: 42429: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38306,7 +41714,7 @@
+@@ -42718,7 +42454,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38309: $i/$j" >&5
-+    echo "configure: 41717: $i/$j" >&5
+-    echo "configure: 42721: $i/$j" >&5
++    echo "configure: 42457: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38322,8 +41730,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38340,8 +41748,8 @@
-   version=""2.0""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -38350,7 +41758,7 @@
+@@ -42762,7 +42498,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38353: $i/$j" >&5
-+    echo "configure: 41761: $i/$j" >&5
+-    echo "configure: 42765: $i/$j" >&5
++    echo "configure: 42501: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38366,7 +41774,7 @@
+@@ -42778,7 +42514,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38369: $i/$j" >&5
-+    echo "configure: 41777: $i/$j" >&5
+-    echo "configure: 42781: $i/$j" >&5
++    echo "configure: 42517: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38390,7 +41798,7 @@
+@@ -42802,7 +42538,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38393: $i/$j" >&5
-+    echo "configure: 41801: $i/$j" >&5
+-    echo "configure: 42805: $i/$j" >&5
++    echo "configure: 42541: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38406,7 +41814,7 @@
+@@ -42818,7 +42554,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38409: $i/$j" >&5
-+    echo "configure: 41817: $i/$j" >&5
+-    echo "configure: 42821: $i/$j" >&5
++    echo "configure: 42557: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38422,7 +41830,7 @@
+@@ -42834,7 +42570,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38425: $i/$j" >&5
-+    echo "configure: 41833: $i/$j" >&5
+-    echo "configure: 42837: $i/$j" >&5
++    echo "configure: 42573: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38450,7 +41858,7 @@
+@@ -42862,7 +42598,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38453: $i/$j" >&5
-+    echo "configure: 41861: $i/$j" >&5
+-    echo "configure: 42865: $i/$j" >&5
++    echo "configure: 42601: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38466,8 +41874,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38484,8 +41892,8 @@
-   version=""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -38494,7 +41902,7 @@
+@@ -42906,7 +42642,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 38497: $i/$j" >&5
-+    echo "configure: 41905: $i/$j" >&5
+-    echo "configure: 42909: $i/$j" >&5
++    echo "configure: 42645: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38510,7 +41918,7 @@
+@@ -42922,7 +42658,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 38513: $i/$j" >&5
-+    echo "configure: 41921: $i/$j" >&5
+-    echo "configure: 42925: $i/$j" >&5
++    echo "configure: 42661: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38534,7 +41942,7 @@
+@@ -42946,7 +42682,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 38537: $i/$j" >&5
-+    echo "configure: 41945: $i/$j" >&5
+-    echo "configure: 42949: $i/$j" >&5
++    echo "configure: 42685: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38550,7 +41958,7 @@
+@@ -42962,7 +42698,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 38553: $i/$j" >&5
-+    echo "configure: 41961: $i/$j" >&5
+-    echo "configure: 42965: $i/$j" >&5
++    echo "configure: 42701: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38566,7 +41974,7 @@
+@@ -42978,7 +42714,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 38569: $i/$j" >&5
-+    echo "configure: 41977: $i/$j" >&5
+-    echo "configure: 42981: $i/$j" >&5
++    echo "configure: 42717: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38594,7 +42002,7 @@
+@@ -43006,7 +42742,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 38597: $i/$j" >&5
-+    echo "configure: 42005: $i/$j" >&5
+-    echo "configure: 43009: $i/$j" >&5
++    echo "configure: 42745: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38610,8 +42018,8 @@
+@@ -43050,7 +42786,7 @@
+ do
+   for j in Python.h;
+   do
+-    echo "configure: 43053: $i/$j" >&5
++    echo "configure: 42789: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_incdir=$i
+@@ -43066,7 +42802,7 @@
+ do
+   for j in python$version/Python.h;
+   do
+-    echo "configure: 43069: $i/$j" >&5
++    echo "configure: 42805: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_incdir=$i
+@@ -43090,7 +42826,7 @@
+ do
+   for j in libpython$version.so;
+   do
+-    echo "configure: 43093: $i/$j" >&5
++    echo "configure: 42829: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_libdir=$i
+@@ -43106,7 +42842,7 @@
+ do
+   for j in libpython$version.a;
+   do
+-    echo "configure: 43109: $i/$j" >&5
++    echo "configure: 42845: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_libdir=$i
+@@ -43122,7 +42858,7 @@
+ do
+   for j in python$version/config/libpython$version.a;
+   do
+-    echo "configure: 43125: $i/$j" >&5
++    echo "configure: 42861: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_libdir=$i
+@@ -43150,7 +42886,7 @@
+ do
+   for j in python$version/copy.py;
+   do
+-    echo "configure: 43153: $i/$j" >&5
++    echo "configure: 42889: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_moddir=$i
+@@ -43260,7 +42996,7 @@
  
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38624,11 +42032,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -38662,23 +42070,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -38687,9 +42108,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -38700,16 +42122,16 @@
+ LIBS="$kde_save_libs"
+@@ -43370,7 +43106,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -38720,11 +42142,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -43480,7 +43216,7 @@
  
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -38758,23 +42180,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -38783,9 +42218,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -38796,16 +42232,16 @@
+ LIBS="$kde_save_libs"
+@@ -43590,7 +43326,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -38816,11 +42252,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -43700,7 +43436,7 @@
  
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -38854,23 +42290,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -38879,9 +42328,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -38892,16 +42342,16 @@
+ LIBS="$kde_save_libs"
+@@ -43810,7 +43546,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -38912,11 +42362,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -43920,7 +43656,7 @@
  
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -38950,23 +42400,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -38975,9 +42438,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -38988,16 +42452,16 @@
+ LIBS="$kde_save_libs"
+@@ -44030,7 +43766,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39008,11 +42472,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -44140,7 +43876,7 @@
  
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -39046,23 +42510,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39071,9 +42548,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39084,16 +42562,16 @@
+ LIBS="$kde_save_libs"
+@@ -44250,7 +43986,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39104,11 +42582,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -44360,7 +44096,7 @@
  
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -39142,23 +42620,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39167,9 +42658,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39180,16 +42672,16 @@
+ LIBS="$kde_save_libs"
+@@ -44470,7 +44206,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39200,11 +42692,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -44580,7 +44316,7 @@
  
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -39238,23 +42730,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39263,9 +42768,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39276,16 +42782,16 @@
+ LIBS="$kde_save_libs"
+@@ -44712,7 +44448,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39296,11 +42802,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -44822,7 +44558,7 @@
  
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -39334,23 +42840,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39359,9 +42878,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39372,16 +42892,16 @@
+ LIBS="$kde_save_libs"
+@@ -44932,7 +44668,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39392,11 +42912,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -45042,7 +44778,7 @@
  
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -39430,23 +42950,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39455,9 +42988,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39468,16 +43002,16 @@
+ LIBS="$kde_save_libs"
+@@ -45152,7 +44888,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39488,11 +43022,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -45262,7 +44998,7 @@
  
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -39526,23 +43060,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39551,9 +43098,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39564,16 +43112,16 @@
+ LIBS="$kde_save_libs"
+@@ -45372,7 +45108,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39584,11 +43132,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -45482,7 +45218,7 @@
  
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -39622,23 +43170,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39647,9 +43208,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39660,16 +43222,16 @@
+ LIBS="$kde_save_libs"
+@@ -45592,7 +45328,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39680,11 +43242,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -45702,7 +45438,7 @@
  
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -39718,23 +43280,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39743,9 +43318,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39756,16 +43332,16 @@
+ LIBS="$kde_save_libs"
+@@ -45812,7 +45548,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39776,11 +43352,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -45922,7 +45658,7 @@
  
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -39814,23 +43390,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39839,9 +43428,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39852,16 +43442,16 @@
+ LIBS="$kde_save_libs"
+@@ -46032,7 +45768,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -39894,11 +43484,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -39932,23 +43522,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -39957,9 +43560,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -39970,16 +43574,16 @@
+ LIBS="$kde_save_libs"
+@@ -46165,7 +45901,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -39990,11 +43594,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -46275,7 +46011,7 @@
  
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -40028,23 +43632,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40053,9 +43670,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40066,16 +43684,16 @@
+ LIBS="$kde_save_libs"
+@@ -46385,7 +46121,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40086,11 +43704,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -40124,23 +43742,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40149,9 +43780,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40162,16 +43794,16 @@
+ LIBS="$kde_save_libs"
+@@ -46495,7 +46231,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40182,11 +43814,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -40220,23 +43852,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40245,9 +43890,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40258,16 +43904,16 @@
+ LIBS="$kde_save_libs"
+@@ -46605,7 +46341,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40278,11 +43924,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -40316,23 +43962,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40341,9 +44000,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40354,16 +44014,16 @@
+ LIBS="$kde_save_libs"
+@@ -46715,7 +46451,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40374,11 +44034,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -40412,23 +44072,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40437,9 +44110,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40450,16 +44124,16 @@
+ LIBS="$kde_save_libs"
+@@ -46825,7 +46561,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40470,11 +44144,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -40508,23 +44182,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40533,9 +44220,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40546,16 +44234,16 @@
+ LIBS="$kde_save_libs"
+@@ -46935,7 +46671,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40566,11 +44254,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -40604,23 +44292,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40629,9 +44330,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40642,16 +44344,16 @@
+ LIBS="$kde_save_libs"
+@@ -47045,7 +46781,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40662,11 +44364,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -40700,23 +44402,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40725,9 +44440,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40738,16 +44454,16 @@
+ LIBS="$kde_save_libs"
+@@ -47155,7 +46891,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40758,11 +44474,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -40796,23 +44512,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40821,9 +44550,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40834,16 +44564,16 @@
+ LIBS="$kde_save_libs"
+@@ -47265,7 +47001,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40854,11 +44584,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -40892,23 +44622,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -40917,9 +44660,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -40930,16 +44674,16 @@
+ LIBS="$kde_save_libs"
+@@ -47375,7 +47111,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -40950,11 +44694,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -40988,23 +44732,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41013,9 +44770,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41026,16 +44784,16 @@
+ LIBS="$kde_save_libs"
+@@ -47485,7 +47221,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41046,11 +44804,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -41084,23 +44842,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41109,9 +44880,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41122,16 +44894,16 @@
+ LIBS="$kde_save_libs"
+@@ -47618,7 +47354,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -41165,11 +44937,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -41203,23 +44975,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41228,9 +45013,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41241,16 +45027,16 @@
+ LIBS="$kde_save_libs"
+@@ -47728,7 +47464,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41261,11 +45047,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -41299,23 +45085,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41324,9 +45123,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41337,16 +45137,16 @@
+ LIBS="$kde_save_libs"
+@@ -47838,7 +47574,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41357,11 +45157,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -41395,23 +45195,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41420,9 +45233,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41433,16 +45247,16 @@
+ LIBS="$kde_save_libs"
+@@ -47948,7 +47684,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41453,11 +45267,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -41491,23 +45305,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41516,9 +45343,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41529,16 +45357,16 @@
+ LIBS="$kde_save_libs"
+@@ -48058,7 +47794,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41549,11 +45377,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -41587,23 +45415,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41612,9 +45453,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41625,16 +45467,16 @@
+ LIBS="$kde_save_libs"
+@@ -48168,7 +47904,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41645,11 +45487,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -41683,23 +45525,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41708,9 +45563,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41721,16 +45577,16 @@
+ LIBS="$kde_save_libs"
+@@ -48278,7 +48014,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41741,11 +45597,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -41779,23 +45635,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41804,9 +45673,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41817,16 +45687,16 @@
+ LIBS="$kde_save_libs"
+@@ -48388,7 +48124,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41837,11 +45707,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -41875,23 +45745,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41900,9 +45783,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -41913,16 +45797,16 @@
+ LIBS="$kde_save_libs"
+@@ -48498,7 +48234,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -41933,11 +45817,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -41971,23 +45855,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -41996,9 +45893,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42009,16 +45907,16 @@
+ LIBS="$kde_save_libs"
+@@ -48608,7 +48344,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42029,11 +45927,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -42067,23 +45965,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42092,9 +46003,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42105,16 +46017,16 @@
+ LIBS="$kde_save_libs"
+@@ -48718,7 +48454,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42125,11 +46037,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -42163,23 +46075,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42188,9 +46113,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42201,16 +46127,16 @@
+ LIBS="$kde_save_libs"
+@@ -48828,7 +48564,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42221,11 +46147,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -42259,23 +46185,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42284,9 +46223,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42297,16 +46237,16 @@
+ LIBS="$kde_save_libs"
+@@ -48938,7 +48674,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42317,11 +46257,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -42355,23 +46295,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42380,9 +46333,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42393,16 +46347,16 @@
+ LIBS="$kde_save_libs"
+@@ -49071,7 +48807,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -42436,11 +46390,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -42474,23 +46428,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42499,9 +46466,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42512,16 +46480,16 @@
+ LIBS="$kde_save_libs"
+@@ -49181,7 +48917,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42532,11 +46500,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -42570,23 +46538,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42595,9 +46576,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42608,16 +46590,16 @@
+ LIBS="$kde_save_libs"
+@@ -49291,7 +49027,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42628,11 +46610,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -42666,23 +46648,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42691,9 +46686,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42704,16 +46700,16 @@
+ LIBS="$kde_save_libs"
+@@ -49401,7 +49137,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42724,11 +46720,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -42762,23 +46758,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42787,9 +46796,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42800,16 +46810,16 @@
+ LIBS="$kde_save_libs"
+@@ -49511,7 +49247,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42820,11 +46830,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -42858,23 +46868,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42883,9 +46906,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42896,16 +46920,16 @@
+ LIBS="$kde_save_libs"
+@@ -49621,7 +49357,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -42916,11 +46940,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -42954,23 +46978,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -42979,9 +47016,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -42992,16 +47030,16 @@
+ LIBS="$kde_save_libs"
+@@ -49731,7 +49467,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43012,11 +47050,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -43050,23 +47088,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43075,9 +47126,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43088,16 +47140,16 @@
+ LIBS="$kde_save_libs"
+@@ -49841,7 +49577,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43108,11 +47160,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -43146,23 +47198,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43171,9 +47236,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43184,16 +47250,16 @@
+ LIBS="$kde_save_libs"
+@@ -49951,7 +49687,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43204,11 +47270,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -43242,23 +47308,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43267,9 +47346,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43280,16 +47360,16 @@
+ LIBS="$kde_save_libs"
+@@ -50061,7 +49797,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43300,11 +47380,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -43338,23 +47418,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43363,9 +47456,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43376,16 +47470,16 @@
+ LIBS="$kde_save_libs"
+@@ -50171,7 +49907,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43396,11 +47490,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -43434,23 +47528,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43459,9 +47566,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43472,16 +47580,16 @@
+ LIBS="$kde_save_libs"
+@@ -50281,7 +50017,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43492,11 +47600,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -43530,23 +47638,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43555,9 +47676,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43568,16 +47690,16 @@
+ LIBS="$kde_save_libs"
+@@ -50391,7 +50127,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43588,11 +47710,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -43626,23 +47748,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43651,9 +47786,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43664,16 +47800,16 @@
+ LIBS="$kde_save_libs"
+@@ -50524,7 +50260,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -43707,11 +47843,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -43745,23 +47881,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43770,9 +47919,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43783,16 +47933,16 @@
+ LIBS="$kde_save_libs"
+@@ -50634,7 +50370,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43803,11 +47953,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -43841,23 +47991,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43866,9 +48029,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43879,16 +48043,16 @@
+ LIBS="$kde_save_libs"
+@@ -50744,7 +50480,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43899,11 +48063,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -43937,23 +48101,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -43962,9 +48139,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -43975,16 +48153,16 @@
+ LIBS="$kde_save_libs"
+@@ -50854,7 +50590,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -43995,11 +48173,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -44033,23 +48211,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44058,9 +48249,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44071,16 +48263,16 @@
+ LIBS="$kde_save_libs"
+@@ -50964,7 +50700,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44091,11 +48283,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -44129,23 +48321,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44154,9 +48359,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44167,16 +48373,16 @@
+ LIBS="$kde_save_libs"
+@@ -51074,7 +50810,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44187,11 +48393,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -44225,23 +48431,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44250,9 +48469,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44263,16 +48483,16 @@
+ LIBS="$kde_save_libs"
+@@ -51184,7 +50920,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44283,11 +48503,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -44321,23 +48541,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44346,9 +48579,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44359,16 +48593,16 @@
+ LIBS="$kde_save_libs"
+@@ -51294,7 +51030,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44379,11 +48613,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -44417,23 +48651,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44442,9 +48689,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44455,16 +48703,16 @@
+ LIBS="$kde_save_libs"
+@@ -51404,7 +51140,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44475,11 +48723,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -44513,23 +48761,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44538,9 +48799,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44551,16 +48813,16 @@
+ LIBS="$kde_save_libs"
+@@ -51514,7 +51250,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44571,11 +48833,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -44609,23 +48871,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44634,9 +48909,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44647,16 +48923,16 @@
+ LIBS="$kde_save_libs"
+@@ -51624,7 +51360,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44667,11 +48943,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -44705,23 +48981,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44730,9 +49019,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44743,16 +49033,16 @@
+ LIBS="$kde_save_libs"
+@@ -51734,7 +51470,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44763,11 +49053,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -44801,23 +49091,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44826,9 +49129,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44839,16 +49143,16 @@
+ LIBS="$kde_save_libs"
+@@ -51844,7 +51580,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -44859,11 +49163,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -44897,23 +49201,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -44922,9 +49239,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -44935,16 +49253,16 @@
+ LIBS="$kde_save_libs"
+@@ -51977,7 +51713,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -44978,11 +49296,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -45016,23 +49334,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45041,9 +49372,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45054,16 +49386,16 @@
+ LIBS="$kde_save_libs"
+@@ -52087,7 +51823,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45074,11 +49406,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -45112,23 +49444,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45137,9 +49482,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45150,16 +49496,16 @@
+ LIBS="$kde_save_libs"
+@@ -52197,7 +51933,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45170,11 +49516,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -45208,23 +49554,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45233,9 +49592,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45246,16 +49606,16 @@
+ LIBS="$kde_save_libs"
+@@ -52307,7 +52043,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45266,11 +49626,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -45304,23 +49664,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45329,9 +49702,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45342,16 +49716,16 @@
+ LIBS="$kde_save_libs"
+@@ -52417,7 +52153,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45362,11 +49736,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -45400,23 +49774,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45425,9 +49812,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45438,16 +49826,16 @@
+ LIBS="$kde_save_libs"
+@@ -52527,7 +52263,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45458,11 +49846,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -45496,23 +49884,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45521,9 +49922,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45534,16 +49936,16 @@
+ LIBS="$kde_save_libs"
+@@ -52637,7 +52373,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45554,11 +49956,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -45592,23 +49994,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45617,9 +50032,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45630,16 +50046,16 @@
+ LIBS="$kde_save_libs"
+@@ -52747,7 +52483,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45650,11 +50066,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -45688,23 +50104,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45713,9 +50142,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45726,16 +50156,16 @@
+ LIBS="$kde_save_libs"
+@@ -52857,7 +52593,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45746,11 +50176,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -45784,23 +50214,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45809,9 +50252,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45822,16 +50266,16 @@
+ LIBS="$kde_save_libs"
+@@ -52967,7 +52703,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45842,11 +50286,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -45880,23 +50324,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -45905,9 +50362,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -45918,16 +50376,16 @@
+ LIBS="$kde_save_libs"
+@@ -53077,7 +52813,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -45938,11 +50396,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -45976,23 +50434,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46001,9 +50472,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -46014,16 +50486,16 @@
+ LIBS="$kde_save_libs"
+@@ -53187,7 +52923,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -46034,11 +50506,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -46072,23 +50544,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46097,9 +50582,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -46110,16 +50596,16 @@
+ LIBS="$kde_save_libs"
+@@ -53297,7 +53033,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -46130,11 +50616,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -46168,23 +50654,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46193,9 +50692,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -46206,16 +50706,16 @@
- 
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -46253,8 +50753,8 @@
- 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
- 	;;
-      esac
--     echo "$as_me:$LINENO: checking for XOpenDisplay in -lXi" >&5
--echo $ECHO_N "checking for XOpenDisplay in -lXi... $ECHO_C" >&6
-+     { echo "$as_me:$LINENO: checking for XOpenDisplay in -lXi" >&5
-+echo $ECHO_N "checking for XOpenDisplay in -lXi... $ECHO_C" >&6; }
- if test "${ac_cv_lib_Xi_XOpenDisplay+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -46267,39 +50767,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char XOpenDisplay ();
- int
- main ()
- {
--XOpenDisplay ();
-+return XOpenDisplay ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46308,14 +50821,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_Xi_XOpenDisplay=no
-+	ac_cv_lib_Xi_XOpenDisplay=no
+ LIBS="$kde_save_libs"
+@@ -53507,12 +53243,12 @@
+ 	ac_cv_have_dpms="no"
  fi
-+
- rm -f conftest.err conftest.$ac_objext \
+ 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xi_XOpenDisplay" >&5
--echo "${ECHO_T}$ac_cv_lib_Xi_XOpenDisplay" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xi_XOpenDisplay" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xi_XOpenDisplay" >&6; }
- if test $ac_cv_lib_Xi_XOpenDisplay = yes; then
-   LIB_XINPUTEXT="-lXi"
  
-@@ -46332,16 +50846,15 @@
- 
- 
- # Check for lcms
--echo "$as_me:$LINENO: checking for lcms >= 1.12" >&5
--echo $ECHO_N "checking for lcms >= 1.12... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for lcms >= 1.12" >&5
-+echo $ECHO_N "checking for lcms >= 1.12... $ECHO_C" >&6; }
- 
- have_lcms_header='no'
- 
-    kde_safe_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $all_includes"
- 
--
--    ac_ext=cc
-+    ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46351,17 +50864,17 @@
- 
- 
-    if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
--echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
-+echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
--echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
--echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking lcms/lcms.h usability" >&5
-+echo $ECHO_N "checking lcms/lcms.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46372,23 +50885,36 @@
- #include <lcms/lcms.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46397,15 +50923,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
--echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking lcms/lcms.h presence" >&5
-+echo $ECHO_N "checking lcms/lcms.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46414,8 +50941,13 @@
- /* end confdefs.h.  */
- #include <lcms/lcms.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -46439,9 +50971,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -46465,25 +50998,18 @@
- echo "$as_me: WARNING: lcms/lcms.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: lcms/lcms.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
--echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for lcms/lcms.h" >&5
-+echo $ECHO_N "checking for lcms/lcms.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_lcms_lcms_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_lcms_lcms_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
--echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_lcms_h" >&6; }
- 
- fi
- if test $ac_cv_header_lcms_lcms_h = yes; then
-@@ -46519,8 +51045,7 @@
-    kde_safe_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $all_includes"
- 
--
--    ac_ext=cc
-+    ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46530,17 +51055,17 @@
- 
- 
-    if test "${ac_cv_header_lcms_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for lcms.h" >&5
--echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for lcms.h" >&5
-+echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_lcms_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
--echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking lcms.h usability" >&5
--echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking lcms.h usability" >&5
-+echo $ECHO_N "checking lcms.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46551,23 +51076,36 @@
- #include <lcms.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46576,15 +51114,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking lcms.h presence" >&5
--echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking lcms.h presence" >&5
-+echo $ECHO_N "checking lcms.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46593,8 +51132,13 @@
- /* end confdefs.h.  */
- #include <lcms.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -46618,9 +51162,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -46644,25 +51189,18 @@
- echo "$as_me: WARNING: lcms.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: lcms.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: lcms.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for lcms.h" >&5
--echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for lcms.h" >&5
-+echo $ECHO_N "checking for lcms.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_lcms_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_lcms_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
--echo "${ECHO_T}$ac_cv_header_lcms_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_lcms_h" >&5
-+echo "${ECHO_T}$ac_cv_header_lcms_h" >&6; }
- 
- fi
- if test $ac_cv_header_lcms_h = yes; then
-@@ -46700,13 +51238,13 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest; then
--    	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+    	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-         HAVELCMS="yes"
-         LCMS_LIBS="-llcms"
- else
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 	HAVELCMS="no"
- 	LCMS_LIBS=""
-         DO_NOT_COMPILE="$DO_NOT_COMPILE krita"
-@@ -46718,8 +51256,7 @@
- if test ! "$LCMS_LIBS" = ""
- then
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46747,23 +51284,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46772,8 +51322,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--lcms_version_114='yes'
-+	lcms_version_114='yes'
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -46785,8 +51336,8 @@
- 
- # IM 6.1.3 changed the number of arguments to GetMagickInfoList
- 
--echo "$as_me:$LINENO: checking if GetMagickInfoList has only 2 arguments" >&5
--echo $ECHO_N "checking if GetMagickInfoList has only 2 arguments... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if GetMagickInfoList has only 2 arguments" >&5
-+echo $ECHO_N "checking if GetMagickInfoList has only 2 arguments... $ECHO_C" >&6; }
- CPPFLAGS_TMP="$CPPFLAGS"   # Save preprocessor flags
- CPPFLAGS="$LIBMAGICK_CPPFLAGS"
- 
-@@ -46810,23 +51361,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46835,36 +51399,36 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--magick_info_list='no'
-+	magick_info_list='no'
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- CPPFLAGS="$CPPFLAGS_TMP"  # Restore preprocessor flags
- 
- if test "$magick_info_list" = 'yes'; then
--	echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+	{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_OLD_GETMAGICKINFOLIST 1
- _ACEOF
- 
- else
--	echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+	{ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- 
- # Check for kunittest
--echo "$as_me:$LINENO: checking for kunittest" >&5
--echo $ECHO_N "checking for kunittest... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for kunittest" >&5
-+echo $ECHO_N "checking for kunittest... $ECHO_C" >&6; }
- 
- have_kunittest_header="no"
- 
-    kde_safe_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $all_includes"
- 
--
--    ac_ext=cc
-+    ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46874,17 +51438,17 @@
- 
- 
-    if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
--echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
-+echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
--echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking kunittest/tester.h usability" >&5
--echo $ECHO_N "checking kunittest/tester.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking kunittest/tester.h usability" >&5
-+echo $ECHO_N "checking kunittest/tester.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46895,23 +51459,36 @@
- #include <kunittest/tester.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -46920,15 +51497,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking kunittest/tester.h presence" >&5
--echo $ECHO_N "checking kunittest/tester.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking kunittest/tester.h presence" >&5
-+echo $ECHO_N "checking kunittest/tester.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46937,8 +51515,13 @@
- /* end confdefs.h.  */
- #include <kunittest/tester.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -46962,9 +51545,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -46988,25 +51572,18 @@
- echo "$as_me: WARNING: kunittest/tester.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: kunittest/tester.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: kunittest/tester.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
--echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for kunittest/tester.h" >&5
-+echo $ECHO_N "checking for kunittest/tester.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_kunittest_tester_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_kunittest_tester_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
--echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_kunittest_tester_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kunittest_tester_h" >&6; }
- 
- fi
- if test $ac_cv_header_kunittest_tester_h = yes; then
-@@ -47041,28 +51618,27 @@
-  test -z "$GL_INCLUDE" && GL_INCLUDE=
- 
- 
--# Check whether --with-gl or --without-gl was given.
-+# Check whether --with-gl was given.
- if test "${with_gl+set}" = set; then
--  withval="$with_gl"
--  gl_test=$withval
-+  withval=$with_gl; gl_test=$withval
- else
-   gl_test="yes"
--fi;
-+fi
-+
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    # GL and Qt Embedded is a no-go for now.
-    ac_cv_have_gl=no
-  elif test "x$gl_test" = xno; then
-    ac_cv_have_gl=no
-  else
--   echo "$as_me:$LINENO: checking for GL" >&5
--echo $ECHO_N "checking for GL... $ECHO_C" >&6
-+   { echo "$as_me:$LINENO: checking for GL" >&5
-+echo $ECHO_N "checking for GL... $ECHO_C" >&6; }
-    if test "${ac_cv_have_gl+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 
--
--     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -47098,23 +51674,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47123,8 +51712,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_have_gl="no"
-+	ac_cv_have_gl="no"
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-@@ -47140,8 +51730,8 @@
+       LDFLAGS="$ac_save_ldflags"
+       CFLAGS="$ac_save_cflags"
+@@ -53801,7 +53537,7 @@
+ 	ac_cv_lib_Xi_XOpenDisplay=no
  fi
  
-   if test "$ac_cv_have_gl" = "no"; then
--    echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-     GL_LDFLAGS=""
-     GLINC=""
- 
-@@ -47161,8 +51751,8 @@
-     else
-        GLINC="-I$GL_INCLUDE"
-     fi
--    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
--echo "${ECHO_T}$ac_cv_have_gl" >&6
-+    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
-+echo "${ECHO_T}$ac_cv_have_gl" >&6; }
- 
-   fi
-  fi
-@@ -47174,8 +51764,8 @@
- 
- # Check for powf.
- 
--echo "$as_me:$LINENO: checking for powf" >&5
--echo $ECHO_N "checking for powf... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for powf" >&5
-+echo $ECHO_N "checking for powf... $ECHO_C" >&6; }
- if test "${ac_cv_func_powf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -47202,52 +51792,59 @@
- 
- #undef powf
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char powf ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_powf) || defined (__stub___powf)
-+#if defined __stub_powf || defined __stub___powf
- choke me
--#else
--char (*f) () = powf;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != powf;
-+return powf ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47256,18 +51853,19 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_powf=no
-+	ac_cv_func_powf=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_powf" >&5
--echo "${ECHO_T}$ac_cv_func_powf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_powf" >&5
-+echo "${ECHO_T}$ac_cv_func_powf" >&6; }
- if test $ac_cv_func_powf = yes; then
-   have_powf="yes"
- else
--  echo "$as_me:$LINENO: checking for powf in -lm" >&5
--echo $ECHO_N "checking for powf in -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for powf in -lm" >&5
-+echo $ECHO_N "checking for powf in -lm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_m_powf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -47280,39 +51878,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char powf ();
- int
- main ()
- {
--powf ();
-+return powf ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47321,14 +51932,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_m_powf=no
-+	ac_cv_lib_m_powf=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_m_powf" >&5
--echo "${ECHO_T}$ac_cv_lib_m_powf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_powf" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_powf" >&6; }
- if test $ac_cv_lib_m_powf = yes; then
-   have_powf="yes"
- else
-@@ -47350,8 +51962,7 @@
-    kde_safe_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $all_includes"
- 
--
--    ac_ext=cc
-+    ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -47361,17 +51972,17 @@
- 
- 
-    if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
--echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
-+echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -54692,7 +54428,7 @@
+ 	ac_cv_have_gl="no"
  fi
--echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
--echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h usability" >&5
--echo $ECHO_N "checking kjsembed/jsproxy_imp.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h usability" >&5
-+echo $ECHO_N "checking kjsembed/jsproxy_imp.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47382,23 +51993,36 @@
- #include <kjsembed/jsproxy_imp.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47407,15 +52031,16 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_header_compiler=no
-+	ac_header_compiler=no
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -55277,7 +55013,7 @@
+ 	eval "$as_ac_var=no"
  fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
  
- # Is the header present?
--echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h presence" >&5
--echo $ECHO_N "checking kjsembed/jsproxy_imp.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking kjsembed/jsproxy_imp.h presence" >&5
-+echo $ECHO_N "checking kjsembed/jsproxy_imp.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47424,8 +52049,13 @@
- /* end confdefs.h.  */
- #include <kjsembed/jsproxy_imp.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -47449,9 +52079,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -47475,25 +52106,18 @@
- echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: kjsembed/jsproxy_imp.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: kjsembed/jsproxy_imp.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
--echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for kjsembed/jsproxy_imp.h" >&5
-+echo $ECHO_N "checking for kjsembed/jsproxy_imp.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_kjsembed_jsproxy_imp_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_cv_header_kjsembed_jsproxy_imp_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
--echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_kjsembed_jsproxy_imp_h" >&5
-+echo "${ECHO_T}$ac_cv_header_kjsembed_jsproxy_imp_h" >&6; }
- 
- fi
- if test $ac_cv_header_kjsembed_jsproxy_imp_h = yes; then
-@@ -47522,8 +52146,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether round is declared" >&5
--echo $ECHO_N "checking whether round is declared... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether round is declared" >&5
-+echo $ECHO_N "checking whether round is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl_round+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -47540,6 +52164,7 @@
- {
- #ifndef round
-   char *p = (char *) round;
-+  return !p;
- #endif
- 
-   ;
-@@ -47547,23 +52172,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47572,12 +52210,13 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_have_decl_round=no
-+	ac_cv_have_decl_round=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_have_decl_round" >&5
--echo "${ECHO_T}$ac_cv_have_decl_round" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_round" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_round" >&6; }
- if test $ac_cv_have_decl_round = yes; then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -47599,18 +52238,19 @@
- for ac_header in ieeefp.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47621,23 +52261,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47646,15 +52299,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47663,8 +52317,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -47688,9 +52347,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -47714,25 +52374,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -47749,9 +52403,9 @@
- for ac_func in fabsl
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -47777,52 +52431,59 @@
- 
- #undef $ac_func
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
- 
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47831,13 +52492,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47849,8 +52512,8 @@
- 
- 
- 
--  echo "$as_me:$LINENO: checking for long double" >&5
--echo $ECHO_N "checking for long double... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for long double" >&5
-+echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
- if test "${ac_cv_c_long_double+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -47889,13 +52552,22 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47908,12 +52580,14 @@
- ( exit $ac_status )
- ac_cv_c_long_double=no
+ ac_res=`eval echo '${'$as_ac_var'}'`
+@@ -55465,7 +55201,7 @@
+ 	ac_cv_lib_m_isinf=no
  fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
  
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_long_double" >&5
--echo "${ECHO_T}$ac_cv_c_long_double" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_long_double" >&5
-+echo "${ECHO_T}$ac_cv_c_long_double" >&6; }
-   if test $ac_cv_c_long_double = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -47938,8 +52612,8 @@
- 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
- 	;;
-      esac
--     echo "$as_me:$LINENO: checking for isinf in -lm" >&5
--echo $ECHO_N "checking for isinf in -lm... $ECHO_C" >&6
-+     { echo "$as_me:$LINENO: checking for isinf in -lm" >&5
-+echo $ECHO_N "checking for isinf in -lm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_m_isinf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -47952,39 +52626,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
- char isinf ();
- int
- main ()
- {
--isinf ();
-+return isinf ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -47993,14 +52680,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 core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_m_isinf" >&5
--echo "${ECHO_T}$ac_cv_lib_m_isinf" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_isinf" >&5
-+echo "${ECHO_T}$ac_cv_lib_m_isinf" >&6; }
- if test $ac_cv_lib_m_isinf = yes; then
- 
- cat >>confdefs.h <<_ACEOF
-@@ -48016,16 +52704,15 @@
- 
- 
- 
--echo "$as_me:$LINENO: checking for SQL support in QT" >&5
--echo $ECHO_N "checking for SQL support in QT... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for SQL support in QT" >&5
-+echo $ECHO_N "checking for SQL support in QT... $ECHO_C" >&6; }
- 
- LIBS_SAVE_KWSL="$LIBS"
- CXXFLAGS_SAVE_KWSL="$CXXFLAGS"
- CFLAGS_SAVE_KWSL="$CFLAGS"
- 
- 
--
-- ac_ext=cc
-+ ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -48060,23 +52747,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -48085,8 +52785,9 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_trycompile_kwsl_qtsql=no
-+	ac_trycompile_kwsl_qtsql=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- CXXFLAGS="$CXXFLAGS_SAVE_KWSL"
-@@ -48101,13 +52802,13 @@
- if eval "test \"`echo $ac_trycompile_kwsl_qtsql`\" = yes"; then
-   SQLDIR=sql
- 
--  echo "$as_me:$LINENO: result: QT supports SQL - compile qtsqlmailmerge" >&5
--echo "${ECHO_T}QT supports SQL - compile qtsqlmailmerge" >&6
-+  { echo "$as_me:$LINENO: result: QT supports SQL - compile qtsqlmailmerge" >&5
-+echo "${ECHO_T}QT supports SQL - compile qtsqlmailmerge" >&6; }
- else
-   SQLDIR=
- 
--  echo "$as_me:$LINENO: result: QT supports SQL -- qtsqlmailmerge will not be built" >&5
--echo "${ECHO_T}QT supports SQL -- qtsqlmailmerge will not be built" >&6
-+  { echo "$as_me:$LINENO: result: QT supports SQL -- qtsqlmailmerge will not be built" >&5
-+echo "${ECHO_T}QT supports SQL -- qtsqlmailmerge will not be built" >&6; }
- fi
- 
- 
-@@ -48181,7 +52882,6 @@
- 
- 
- 
--
-    ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -48192,10 +52892,9 @@
- 
- 
- 
--
-    kde_safe_cppflags=$CPPFLAGS
-    CPPFLAGS="$CPPFLAGS $all_includes"
--    ac_ext=cc
-+    ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -48208,18 +52907,19 @@
- for ac_header in kspell2/broker.h
+@@ -55924,7 +55660,7 @@
  do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
-   # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48230,23 +52930,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -48255,15 +52968,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
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
- 
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48272,8 +52986,13 @@
- /* end confdefs.h.  */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -48297,9 +53016,10 @@
- 
-   ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -48323,25 +53043,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+
-     ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- 
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -48368,12 +53082,12 @@
- _ACEOF
- 
-            LIBKSPELL2="-lkspell2"
--           echo "$as_me:$LINENO: result: found in $ac_kspell2_includes" >&5
--echo "${ECHO_T}found in $ac_kspell2_includes" >&6
-+           { echo "$as_me:$LINENO: result: found in $ac_kspell2_includes" >&5
-+echo "${ECHO_T}found in $ac_kspell2_includes" >&6; }
-    else
-            LIBKSPELL2=""
--           echo "$as_me:$LINENO: result: not found -- spell-checking will be disabled" >&5
--echo "${ECHO_T}not found -- spell-checking will be disabled" >&6
-+           { echo "$as_me:$LINENO: result: not found -- spell-checking will be disabled" >&5
-+echo "${ECHO_T}not found -- spell-checking will be disabled" >&6; }
-    fi
- 
-    ac_ext=c
-@@ -48383,13 +53097,13 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--# Check whether --enable-scripting or --disable-scripting was given.
-+# Check whether --enable-scripting was given.
- if test "${enable_scripting+set}" = set; then
--  enableval="$enable_scripting"
--  compile_kross=$enableval
-+  enableval=$enable_scripting; compile_kross=$enableval
- else
-   compile_kross=yes
--fi;
-+fi
-+
- 
- 
- if test "x$compile_kross" = "xyes"; then
-@@ -48418,8 +53132,8 @@
-   version=""2.4""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -48428,7 +53142,7 @@
+   for j in Python.h;
+   do
+-    echo "configure: 55927: $i/$j" >&5
++    echo "configure: 55663: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_incdir=$i
+@@ -55940,7 +55676,7 @@
  do
+   for j in python$version/Python.h;
+   do
+-    echo "configure: 55943: $i/$j" >&5
++    echo "configure: 55679: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_incdir=$i
+@@ -55964,7 +55700,7 @@
+ do
+   for j in libpython$version.so;
+   do
+-    echo "configure: 55967: $i/$j" >&5
++    echo "configure: 55703: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_libdir=$i
+@@ -55980,7 +55716,7 @@
+ do
+   for j in libpython$version.a;
+   do
+-    echo "configure: 55983: $i/$j" >&5
++    echo "configure: 55719: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_libdir=$i
+@@ -55996,7 +55732,7 @@
+ do
+   for j in python$version/config/libpython$version.a;
+   do
+-    echo "configure: 55999: $i/$j" >&5
++    echo "configure: 55735: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_libdir=$i
+@@ -56024,7 +55760,7 @@
+ do
+   for j in python$version/copy.py;
+   do
+-    echo "configure: 56027: $i/$j" >&5
++    echo "configure: 55763: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       python_moddir=$i
+@@ -56068,7 +55804,7 @@
+ do
    for j in Python.h;
    do
--    echo "configure: 48431: $i/$j" >&5
-+    echo "configure: 53145: $i/$j" >&5
+-    echo "configure: 56071: $i/$j" >&5
++    echo "configure: 55807: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48444,7 +53158,7 @@
+@@ -56084,7 +55820,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48447: $i/$j" >&5
-+    echo "configure: 53161: $i/$j" >&5
+-    echo "configure: 56087: $i/$j" >&5
++    echo "configure: 55823: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48468,7 +53182,7 @@
+@@ -56108,7 +55844,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48471: $i/$j" >&5
-+    echo "configure: 53185: $i/$j" >&5
+-    echo "configure: 56111: $i/$j" >&5
++    echo "configure: 55847: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48484,7 +53198,7 @@
+@@ -56124,7 +55860,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48487: $i/$j" >&5
-+    echo "configure: 53201: $i/$j" >&5
+-    echo "configure: 56127: $i/$j" >&5
++    echo "configure: 55863: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48500,7 +53214,7 @@
+@@ -56140,7 +55876,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48503: $i/$j" >&5
-+    echo "configure: 53217: $i/$j" >&5
+-    echo "configure: 56143: $i/$j" >&5
++    echo "configure: 55879: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48528,7 +53242,7 @@
+@@ -56168,7 +55904,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48531: $i/$j" >&5
-+    echo "configure: 53245: $i/$j" >&5
+-    echo "configure: 56171: $i/$j" >&5
++    echo "configure: 55907: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48544,8 +53258,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -48562,8 +53276,8 @@
-   version=""2.3""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -48572,7 +53286,7 @@
+@@ -56212,7 +55948,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48575: $i/$j" >&5
-+    echo "configure: 53289: $i/$j" >&5
+-    echo "configure: 56215: $i/$j" >&5
++    echo "configure: 55951: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48588,7 +53302,7 @@
+@@ -56228,7 +55964,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48591: $i/$j" >&5
-+    echo "configure: 53305: $i/$j" >&5
+-    echo "configure: 56231: $i/$j" >&5
++    echo "configure: 55967: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48612,7 +53326,7 @@
+@@ -56252,7 +55988,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48615: $i/$j" >&5
-+    echo "configure: 53329: $i/$j" >&5
+-    echo "configure: 56255: $i/$j" >&5
++    echo "configure: 55991: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48628,7 +53342,7 @@
+@@ -56268,7 +56004,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48631: $i/$j" >&5
-+    echo "configure: 53345: $i/$j" >&5
+-    echo "configure: 56271: $i/$j" >&5
++    echo "configure: 56007: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48644,7 +53358,7 @@
+@@ -56284,7 +56020,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48647: $i/$j" >&5
-+    echo "configure: 53361: $i/$j" >&5
+-    echo "configure: 56287: $i/$j" >&5
++    echo "configure: 56023: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48672,7 +53386,7 @@
+@@ -56312,7 +56048,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48675: $i/$j" >&5
-+    echo "configure: 53389: $i/$j" >&5
+-    echo "configure: 56315: $i/$j" >&5
++    echo "configure: 56051: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48688,8 +53402,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -48706,8 +53420,8 @@
-   version=""2.2""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -48716,7 +53430,7 @@
+@@ -56356,7 +56092,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48719: $i/$j" >&5
-+    echo "configure: 53433: $i/$j" >&5
+-    echo "configure: 56359: $i/$j" >&5
++    echo "configure: 56095: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48732,7 +53446,7 @@
+@@ -56372,7 +56108,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48735: $i/$j" >&5
-+    echo "configure: 53449: $i/$j" >&5
+-    echo "configure: 56375: $i/$j" >&5
++    echo "configure: 56111: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48756,7 +53470,7 @@
+@@ -56396,7 +56132,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48759: $i/$j" >&5
-+    echo "configure: 53473: $i/$j" >&5
+-    echo "configure: 56399: $i/$j" >&5
++    echo "configure: 56135: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48772,7 +53486,7 @@
+@@ -56412,7 +56148,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48775: $i/$j" >&5
-+    echo "configure: 53489: $i/$j" >&5
+-    echo "configure: 56415: $i/$j" >&5
++    echo "configure: 56151: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48788,7 +53502,7 @@
+@@ -56428,7 +56164,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48791: $i/$j" >&5
-+    echo "configure: 53505: $i/$j" >&5
+-    echo "configure: 56431: $i/$j" >&5
++    echo "configure: 56167: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48816,7 +53530,7 @@
+@@ -56456,7 +56192,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48819: $i/$j" >&5
-+    echo "configure: 53533: $i/$j" >&5
+-    echo "configure: 56459: $i/$j" >&5
++    echo "configure: 56195: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48832,8 +53546,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -48850,8 +53564,8 @@
-   version=""2.1""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -48860,7 +53574,7 @@
+@@ -56500,7 +56236,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 48863: $i/$j" >&5
-+    echo "configure: 53577: $i/$j" >&5
+-    echo "configure: 56503: $i/$j" >&5
++    echo "configure: 56239: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48876,7 +53590,7 @@
+@@ -56516,7 +56252,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 48879: $i/$j" >&5
-+    echo "configure: 53593: $i/$j" >&5
+-    echo "configure: 56519: $i/$j" >&5
++    echo "configure: 56255: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -48900,7 +53614,7 @@
+@@ -56540,7 +56276,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 48903: $i/$j" >&5
-+    echo "configure: 53617: $i/$j" >&5
+-    echo "configure: 56543: $i/$j" >&5
++    echo "configure: 56279: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48916,7 +53630,7 @@
+@@ -56556,7 +56292,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 48919: $i/$j" >&5
-+    echo "configure: 53633: $i/$j" >&5
+-    echo "configure: 56559: $i/$j" >&5
++    echo "configure: 56295: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48932,7 +53646,7 @@
+@@ -56572,7 +56308,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 48935: $i/$j" >&5
-+    echo "configure: 53649: $i/$j" >&5
+-    echo "configure: 56575: $i/$j" >&5
++    echo "configure: 56311: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -48960,7 +53674,7 @@
+@@ -56600,7 +56336,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 48963: $i/$j" >&5
-+    echo "configure: 53677: $i/$j" >&5
+-    echo "configure: 56603: $i/$j" >&5
++    echo "configure: 56339: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -48976,8 +53690,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -48994,8 +53708,8 @@
-   version=""2.0""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -49004,7 +53718,7 @@
+@@ -56644,7 +56380,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 49007: $i/$j" >&5
-+    echo "configure: 53721: $i/$j" >&5
+-    echo "configure: 56647: $i/$j" >&5
++    echo "configure: 56383: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -49020,7 +53734,7 @@
+@@ -56660,7 +56396,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 49023: $i/$j" >&5
-+    echo "configure: 53737: $i/$j" >&5
+-    echo "configure: 56663: $i/$j" >&5
++    echo "configure: 56399: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -49044,7 +53758,7 @@
+@@ -56684,7 +56420,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 49047: $i/$j" >&5
-+    echo "configure: 53761: $i/$j" >&5
+-    echo "configure: 56687: $i/$j" >&5
++    echo "configure: 56423: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -49060,7 +53774,7 @@
+@@ -56700,7 +56436,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 49063: $i/$j" >&5
-+    echo "configure: 53777: $i/$j" >&5
+-    echo "configure: 56703: $i/$j" >&5
++    echo "configure: 56439: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -49076,7 +53790,7 @@
+@@ -56716,7 +56452,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 49079: $i/$j" >&5
-+    echo "configure: 53793: $i/$j" >&5
+-    echo "configure: 56719: $i/$j" >&5
++    echo "configure: 56455: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -49104,7 +53818,7 @@
+@@ -56744,7 +56480,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 49107: $i/$j" >&5
-+    echo "configure: 53821: $i/$j" >&5
+-    echo "configure: 56747: $i/$j" >&5
++    echo "configure: 56483: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -49120,8 +53834,8 @@
- 
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -49138,8 +53852,8 @@
-   version=""
- fi
- 
--echo "$as_me:$LINENO: checking for Python$version" >&5
--echo $ECHO_N "checking for Python$version... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for Python$version" >&5
-+echo $ECHO_N "checking for Python$version... $ECHO_C" >&6; }
- 
- python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
- 
-@@ -49148,7 +53862,7 @@
+@@ -56788,7 +56524,7 @@
  do
    for j in Python.h;
    do
--    echo "configure: 49151: $i/$j" >&5
-+    echo "configure: 53865: $i/$j" >&5
+-    echo "configure: 56791: $i/$j" >&5
++    echo "configure: 56527: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -49164,7 +53878,7 @@
+@@ -56804,7 +56540,7 @@
  do
    for j in python$version/Python.h;
    do
--    echo "configure: 49167: $i/$j" >&5
-+    echo "configure: 53881: $i/$j" >&5
+-    echo "configure: 56807: $i/$j" >&5
++    echo "configure: 56543: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -49188,7 +53902,7 @@
+@@ -56828,7 +56564,7 @@
  do
    for j in libpython$version.so;
    do
--    echo "configure: 49191: $i/$j" >&5
-+    echo "configure: 53905: $i/$j" >&5
+-    echo "configure: 56831: $i/$j" >&5
++    echo "configure: 56567: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -49204,7 +53918,7 @@
+@@ -56844,7 +56580,7 @@
  do
    for j in libpython$version.a;
    do
--    echo "configure: 49207: $i/$j" >&5
-+    echo "configure: 53921: $i/$j" >&5
+-    echo "configure: 56847: $i/$j" >&5
++    echo "configure: 56583: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -49220,7 +53934,7 @@
+@@ -56860,7 +56596,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
--    echo "configure: 49223: $i/$j" >&5
-+    echo "configure: 53937: $i/$j" >&5
+-    echo "configure: 56863: $i/$j" >&5
++    echo "configure: 56599: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -49248,7 +53962,7 @@
+@@ -56888,7 +56624,7 @@
  do
    for j in python$version/copy.py;
    do
--    echo "configure: 49251: $i/$j" >&5
-+    echo "configure: 53965: $i/$j" >&5
+-    echo "configure: 56891: $i/$j" >&5
++    echo "configure: 56627: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -49264,8 +53978,8 @@
+@@ -56998,7 +56734,7 @@
  
- PYTHONMODDIR=$python_moddir
- 
--echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
--echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6
-+{ echo "$as_me:$LINENO: result: header $python_incdir library $python_libdir modules $python_moddir" >&5
-+echo "${ECHO_T}header $python_incdir library $python_libdir modules $python_moddir" >&6; }
- 
- if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-    LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -49278,11 +53992,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -49316,23 +54030,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -49341,9 +54068,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -49354,16 +54082,16 @@
+ LIBS="$kde_save_libs"
+@@ -57108,7 +56844,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -49374,11 +54102,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -57218,7 +56954,7 @@
  
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -49412,23 +54140,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -49437,9 +54178,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -49450,16 +54192,16 @@
+ LIBS="$kde_save_libs"
+@@ -57328,7 +57064,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -49470,11 +54212,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -57438,7 +57174,7 @@
  
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -49508,23 +54250,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -49533,9 +54288,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -49546,16 +54302,16 @@
+ LIBS="$kde_save_libs"
+@@ -57548,7 +57284,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -49566,11 +54322,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -57658,7 +57394,7 @@
  
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -49604,23 +54360,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -49629,9 +54398,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -49642,16 +54412,16 @@
+ LIBS="$kde_save_libs"
+@@ -57768,7 +57504,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -49662,11 +54432,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -57878,7 +57614,7 @@
  
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -49700,23 +54470,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -49725,9 +54508,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -49738,16 +54522,16 @@
+ LIBS="$kde_save_libs"
+@@ -57988,7 +57724,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -49758,11 +54542,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -58098,7 +57834,7 @@
  
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -49796,23 +54580,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -49821,9 +54618,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -49834,16 +54632,16 @@
+ LIBS="$kde_save_libs"
+@@ -58208,7 +57944,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -49854,11 +54652,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -58318,7 +58054,7 @@
  
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -49892,23 +54690,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -49917,9 +54728,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -49930,16 +54742,16 @@
+ LIBS="$kde_save_libs"
+@@ -58450,7 +58186,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -49950,11 +54762,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -58560,7 +58296,7 @@
  
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -49988,23 +54800,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50013,9 +54838,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50026,16 +54852,16 @@
+ LIBS="$kde_save_libs"
+@@ -58670,7 +58406,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50046,11 +54872,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -58780,7 +58516,7 @@
  
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -50084,23 +54910,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50109,9 +54948,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50122,16 +54962,16 @@
+ LIBS="$kde_save_libs"
+@@ -58890,7 +58626,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50142,11 +54982,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -59000,7 +58736,7 @@
  
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -50180,23 +55020,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50205,9 +55058,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50218,16 +55072,16 @@
+ LIBS="$kde_save_libs"
+@@ -59110,7 +58846,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50238,11 +55092,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -59220,7 +58956,7 @@
  
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -50276,23 +55130,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50301,9 +55168,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50314,16 +55182,16 @@
+ LIBS="$kde_save_libs"
+@@ -59330,7 +59066,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50334,11 +55202,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -59440,7 +59176,7 @@
  
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -50372,23 +55240,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50397,9 +55278,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50410,16 +55292,16 @@
+ LIBS="$kde_save_libs"
+@@ -59550,7 +59286,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50430,11 +55312,11 @@
- if test "$kde_python_link_found" = no; then
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -59660,7 +59396,7 @@
  
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -50468,23 +55350,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50493,9 +55388,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50506,16 +55402,16 @@
+ LIBS="$kde_save_libs"
+@@ -59770,7 +59506,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -50548,11 +55444,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -50586,23 +55482,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50611,9 +55520,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50624,16 +55534,16 @@
+ LIBS="$kde_save_libs"
+@@ -59903,7 +59639,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50644,11 +55554,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -50682,23 +55592,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50707,9 +55630,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50720,16 +55644,16 @@
+ LIBS="$kde_save_libs"
+@@ -60013,7 +59749,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50740,11 +55664,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -50778,23 +55702,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50803,9 +55740,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50816,16 +55754,16 @@
+ LIBS="$kde_save_libs"
+@@ -60123,7 +59859,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50836,11 +55774,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -50874,23 +55812,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50899,9 +55850,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -50912,16 +55864,16 @@
+ LIBS="$kde_save_libs"
+@@ -60233,7 +59969,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -50932,11 +55884,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -50970,23 +55922,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -50995,9 +55960,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51008,16 +55974,16 @@
+ LIBS="$kde_save_libs"
+@@ -60343,7 +60079,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51028,11 +55994,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -51066,23 +56032,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51091,9 +56070,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51104,16 +56084,16 @@
+ LIBS="$kde_save_libs"
+@@ -60453,7 +60189,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51124,11 +56104,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -51162,23 +56142,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51187,9 +56180,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51200,16 +56194,16 @@
+ LIBS="$kde_save_libs"
+@@ -60563,7 +60299,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51220,11 +56214,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -51258,23 +56252,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51283,9 +56290,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51296,16 +56304,16 @@
+ LIBS="$kde_save_libs"
+@@ -60673,7 +60409,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51316,11 +56324,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -51354,23 +56362,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51379,9 +56400,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51392,16 +56414,16 @@
+ LIBS="$kde_save_libs"
+@@ -60783,7 +60519,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51412,11 +56434,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -51450,23 +56472,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51475,9 +56510,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51488,16 +56524,16 @@
+ LIBS="$kde_save_libs"
+@@ -60893,7 +60629,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51508,11 +56544,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -51546,23 +56582,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51571,9 +56620,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51584,16 +56634,16 @@
+ LIBS="$kde_save_libs"
+@@ -61003,7 +60739,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51604,11 +56654,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -51642,23 +56692,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51667,9 +56730,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51680,16 +56744,16 @@
+ LIBS="$kde_save_libs"
+@@ -61113,7 +60849,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51700,11 +56764,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -51738,23 +56802,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51763,9 +56840,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51776,16 +56854,16 @@
+ LIBS="$kde_save_libs"
+@@ -61223,7 +60959,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -51819,11 +56897,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -51857,23 +56935,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51882,9 +56973,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51895,16 +56987,16 @@
+ LIBS="$kde_save_libs"
+@@ -61356,7 +61092,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -51915,11 +57007,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -51953,23 +57045,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -51978,9 +57083,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -51991,16 +57097,16 @@
+ LIBS="$kde_save_libs"
+@@ -61466,7 +61202,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52011,11 +57117,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -52049,23 +57155,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52074,9 +57193,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52087,16 +57207,16 @@
+ LIBS="$kde_save_libs"
+@@ -61576,7 +61312,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52107,11 +57227,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -52145,23 +57265,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52170,9 +57303,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52183,16 +57317,16 @@
+ LIBS="$kde_save_libs"
+@@ -61686,7 +61422,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52203,11 +57337,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -52241,23 +57375,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52266,9 +57413,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52279,16 +57427,16 @@
+ LIBS="$kde_save_libs"
+@@ -61796,7 +61532,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52299,11 +57447,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -52337,23 +57485,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52362,9 +57523,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52375,16 +57537,16 @@
+ LIBS="$kde_save_libs"
+@@ -61906,7 +61642,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52395,11 +57557,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -52433,23 +57595,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52458,9 +57633,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52471,16 +57647,16 @@
+ LIBS="$kde_save_libs"
+@@ -62016,7 +61752,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52491,11 +57667,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -52529,23 +57705,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52554,9 +57743,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52567,16 +57757,16 @@
+ LIBS="$kde_save_libs"
+@@ -62126,7 +61862,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52587,11 +57777,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -52625,23 +57815,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52650,9 +57853,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52663,16 +57867,16 @@
+ LIBS="$kde_save_libs"
+@@ -62236,7 +61972,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52683,11 +57887,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -52721,23 +57925,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52746,9 +57963,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52759,16 +57977,16 @@
+ LIBS="$kde_save_libs"
+@@ -62346,7 +62082,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52779,11 +57997,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -52817,23 +58035,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52842,9 +58073,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52855,16 +58087,16 @@
+ LIBS="$kde_save_libs"
+@@ -62456,7 +62192,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52875,11 +58107,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -52913,23 +58145,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -52938,9 +58183,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -52951,16 +58197,16 @@
+ LIBS="$kde_save_libs"
+@@ -62566,7 +62302,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -52971,11 +58217,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -53009,23 +58255,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53034,9 +58293,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53047,16 +58307,16 @@
+ LIBS="$kde_save_libs"
+@@ -62676,7 +62412,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -53090,11 +58350,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -53128,23 +58388,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53153,9 +58426,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53166,16 +58440,16 @@
+ LIBS="$kde_save_libs"
+@@ -62809,7 +62545,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53186,11 +58460,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -53224,23 +58498,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53249,9 +58536,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53262,16 +58550,16 @@
+ LIBS="$kde_save_libs"
+@@ -62919,7 +62655,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53282,11 +58570,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -53320,23 +58608,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53345,9 +58646,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53358,16 +58660,16 @@
+ LIBS="$kde_save_libs"
+@@ -63029,7 +62765,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53378,11 +58680,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -53416,23 +58718,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53441,9 +58756,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53454,16 +58770,16 @@
+ LIBS="$kde_save_libs"
+@@ -63139,7 +62875,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53474,11 +58790,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -53512,23 +58828,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53537,9 +58866,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53550,16 +58880,16 @@
+ LIBS="$kde_save_libs"
+@@ -63249,7 +62985,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53570,11 +58900,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -53608,23 +58938,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53633,9 +58976,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53646,16 +58990,16 @@
+ LIBS="$kde_save_libs"
+@@ -63359,7 +63095,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53666,11 +59010,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -53704,23 +59048,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53729,9 +59086,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53742,16 +59100,16 @@
+ LIBS="$kde_save_libs"
+@@ -63469,7 +63205,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53762,11 +59120,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -53800,23 +59158,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53825,9 +59196,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53838,16 +59210,16 @@
+ LIBS="$kde_save_libs"
+@@ -63579,7 +63315,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53858,11 +59230,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -53896,23 +59268,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -53921,9 +59306,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -53934,16 +59320,16 @@
+ LIBS="$kde_save_libs"
+@@ -63689,7 +63425,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -53954,11 +59340,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -53992,23 +59378,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54017,9 +59416,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54030,16 +59430,16 @@
+ LIBS="$kde_save_libs"
+@@ -63799,7 +63535,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54050,11 +59450,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -54088,23 +59488,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54113,9 +59526,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54126,16 +59540,16 @@
+ LIBS="$kde_save_libs"
+@@ -63909,7 +63645,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54146,11 +59560,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -54184,23 +59598,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54209,9 +59636,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54222,16 +59650,16 @@
+ LIBS="$kde_save_libs"
+@@ -64019,7 +63755,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54242,11 +59670,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -54280,23 +59708,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54305,9 +59746,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54318,16 +59760,16 @@
+ LIBS="$kde_save_libs"
+@@ -64129,7 +63865,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -54361,11 +59803,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -54399,23 +59841,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54424,9 +59879,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54437,16 +59893,16 @@
+ LIBS="$kde_save_libs"
+@@ -64262,7 +63998,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54457,11 +59913,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -54495,23 +59951,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54520,9 +59989,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54533,16 +60003,16 @@
+ LIBS="$kde_save_libs"
+@@ -64372,7 +64108,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54553,11 +60023,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -54591,23 +60061,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54616,9 +60099,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54629,16 +60113,16 @@
+ LIBS="$kde_save_libs"
+@@ -64482,7 +64218,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54649,11 +60133,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -54687,23 +60171,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54712,9 +60209,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54725,16 +60223,16 @@
+ LIBS="$kde_save_libs"
+@@ -64592,7 +64328,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54745,11 +60243,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -54783,23 +60281,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54808,9 +60319,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54821,16 +60333,16 @@
+ LIBS="$kde_save_libs"
+@@ -64702,7 +64438,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54841,11 +60353,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -54879,23 +60391,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -54904,9 +60429,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -54917,16 +60443,16 @@
+ LIBS="$kde_save_libs"
+@@ -64812,7 +64548,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -54937,11 +60463,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -54975,23 +60501,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55000,9 +60539,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55013,16 +60553,16 @@
+ LIBS="$kde_save_libs"
+@@ -64922,7 +64658,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55033,11 +60573,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -55071,23 +60611,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55096,9 +60649,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55109,16 +60663,16 @@
+ LIBS="$kde_save_libs"
+@@ -65032,7 +64768,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55129,11 +60683,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -55167,23 +60721,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55192,9 +60759,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55205,16 +60773,16 @@
+ LIBS="$kde_save_libs"
+@@ -65142,7 +64878,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55225,11 +60793,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -55263,23 +60831,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55288,9 +60869,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55301,16 +60883,16 @@
+ LIBS="$kde_save_libs"
+@@ -65252,7 +64988,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55321,11 +60903,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -55359,23 +60941,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55384,9 +60979,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55397,16 +60993,16 @@
+ LIBS="$kde_save_libs"
+@@ -65362,7 +65098,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55417,11 +61013,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -55455,23 +61051,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55480,9 +61089,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55493,16 +61103,16 @@
+ LIBS="$kde_save_libs"
+@@ -65472,7 +65208,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55513,11 +61123,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -55551,23 +61161,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55576,9 +61199,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55589,16 +61213,16 @@
+ LIBS="$kde_save_libs"
+@@ -65582,7 +65318,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -55632,11 +61256,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "normal" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on " >&5
--echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on " >&5
-+echo $ECHO_N "checking if Python depends on ... $ECHO_C" >&6; }
  fi
  
- if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -55670,23 +61294,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55695,9 +61332,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_normal=no
-+	kde_cv_try_link_python_normal=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55708,16 +61346,16 @@
+ LIBS="$kde_save_libs"
+@@ -65715,7 +65451,7 @@
  
- 
- if test "$kde_cv_try_link_python_normal" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "normal" = normal; then
-     LIBPYTHON="$LIBPYTHON "
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55728,11 +61366,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
--echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -lm" >&5
-+echo $ECHO_N "checking if Python depends on -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -55766,23 +61404,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55791,9 +61442,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m=no
-+	kde_cv_try_link_python_m=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55804,16 +61456,16 @@
+ LIBS="$kde_save_libs"
+@@ -65825,7 +65561,7 @@
  
- 
- if test "$kde_cv_try_link_python_m" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m" = normal; then
-     LIBPYTHON="$LIBPYTHON -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55824,11 +61476,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -55862,23 +61514,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55887,9 +61552,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread=no
-+	kde_cv_try_link_python_pthread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55900,16 +61566,16 @@
+ LIBS="$kde_save_libs"
+@@ -65935,7 +65671,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -55920,11 +61586,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "tcl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
--echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ltcl" >&5
-+echo $ECHO_N "checking if Python depends on -ltcl... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -55958,23 +61624,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -55983,9 +61662,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_tcl=no
-+	kde_cv_try_link_python_tcl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -55996,16 +61676,16 @@
+ LIBS="$kde_save_libs"
+@@ -66045,7 +65781,7 @@
  
- 
- if test "$kde_cv_try_link_python_tcl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "tcl" = normal; then
-     LIBPYTHON="$LIBPYTHON -ltcl"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56016,11 +61696,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "db2" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
--echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on -ldb2" >&5
-+echo $ECHO_N "checking if Python depends on -ldb2... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -56054,23 +61734,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56079,9 +61772,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_db2=no
-+	kde_cv_try_link_python_db2=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56092,16 +61786,16 @@
+ LIBS="$kde_save_libs"
+@@ -66155,7 +65891,7 @@
  
- 
- if test "$kde_cv_try_link_python_db2" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "db2" = normal; then
-     LIBPYTHON="$LIBPYTHON -ldb2"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56112,11 +61806,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -56150,23 +61844,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56175,9 +61882,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread=no
-+	kde_cv_try_link_python_m_and_thread=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56188,16 +61896,16 @@
+ LIBS="$kde_save_libs"
+@@ -66265,7 +66001,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56208,11 +61916,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_util" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -56246,23 +61954,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56271,9 +61992,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_util=no
-+	kde_cv_try_link_python_m_and_thread_and_util=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56284,16 +62006,16 @@
+ LIBS="$kde_save_libs"
+@@ -66375,7 +66111,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_util" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56304,11 +62026,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb-3 -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -56342,23 +62064,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56367,9 +62102,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db3=no
-+	kde_cv_try_link_python_m_and_thread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56380,16 +62116,16 @@
+ LIBS="$kde_save_libs"
+@@ -66485,7 +66221,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb-3 -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56400,11 +62136,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_db3" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -ldb-3" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -ldb-3... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -56438,23 +62174,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56463,9 +62212,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_db3=no
-+	kde_cv_try_link_python_pthread_and_db3=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56476,16 +62226,16 @@
+ LIBS="$kde_save_libs"
+@@ -66595,7 +66331,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_db3" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -ldb-3"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56496,11 +62246,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -ltermcap -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -56534,23 +62284,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56559,9 +62322,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db=no
-+	kde_cv_try_link_python_m_and_thread_and_db=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56572,16 +62336,16 @@
+ LIBS="$kde_save_libs"
+@@ -66705,7 +66441,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -ltermcap -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56592,11 +62356,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_dl" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -56630,23 +62394,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56655,9 +62432,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_dl=no
-+	kde_cv_try_link_python_pthread_and_dl=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56668,16 +62446,16 @@
+ LIBS="$kde_save_libs"
+@@ -66815,7 +66551,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_dl" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56688,11 +62466,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "pthread_and_panel_curses" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD $LIBDL -lm -lpanel -lcurses... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -56726,23 +62504,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56751,9 +62542,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_pthread_and_panel_curses=no
-+	kde_cv_try_link_python_pthread_and_panel_curses=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56764,16 +62556,16 @@
+ LIBS="$kde_save_libs"
+@@ -66925,7 +66661,7 @@
  
- 
- if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "pthread_and_panel_curses" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD $LIBDL -lm -lpanel -lcurses"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
  fi
  
-@@ -56784,11 +62576,11 @@
- if test "$kde_python_link_found" = no; then
- 
- if test "m_and_thread_and_db_special" = normal; then
--  echo "$as_me:$LINENO: checking if a Python application links" >&5
--echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if a Python application links" >&5
-+echo $ECHO_N "checking if a Python application links... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
--echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if Python depends on $LIBPTHREAD -lm -ldb -lutil" >&5
-+echo $ECHO_N "checking if Python depends on $LIBPTHREAD -lm -ldb -lutil... $ECHO_C" >&6; }
- fi
- 
- if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -56822,23 +62614,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (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
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -56847,9 +62652,10 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--kde_cv_try_link_python_m_and_thread_and_db_special=no
-+	kde_cv_try_link_python_m_and_thread_and_db_special=no
- 
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
-@@ -56860,16 +62666,16 @@
+ LIBS="$kde_save_libs"
+@@ -67035,7 +66771,7 @@
  
- 
- if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-   kde_python_link_found=yes
-   if test ! "m_and_thread_and_db_special" = normal; then
-     LIBPYTHON="$LIBPYTHON $LIBPTHREAD -lm -ldb -lutil"
-   fi
- 
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
-     Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-     and contact the authors to let them know about this problem" >&5
-@@ -56918,8 +62724,8 @@
- if test "x$compile_kross" = "xyes" ; then
-   # Extract the first word of "ruby", so it can be a program name with args.
- set dummy ruby; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RUBY+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -56932,29 +62738,31 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_RUBY="ruby"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
- 
  fi
- fi
- RUBY=$ac_cv_prog_RUBY
- if test -n "$RUBY"; then
--  echo "$as_me:$LINENO: result: $RUBY" >&5
--echo "${ECHO_T}$RUBY" >&6
-+  { echo "$as_me:$LINENO: result: $RUBY" >&5
-+echo "${ECHO_T}$RUBY" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
  
- 
-+
-   if test -n "$RUBY"; then
--    echo "$as_me:$LINENO: checking for Ruby dirs" >&5
--echo $ECHO_N "checking for Ruby dirs... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for Ruby dirs" >&5
-+echo $ECHO_N "checking for Ruby dirs... $ECHO_C" >&6; }
-     RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["archdir"])'`
-     RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitearchdir"])'`
-     RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["sitelibdir"])'`
-@@ -56962,7 +62770,7 @@
-     RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["libdir"])'`
-     RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["LIBRUBYARG_SHARED"])'`
-     RUBY_ENABLESHARED=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG["ENABLE_SHARED"])'`
--    echo "$as_me:$LINENO: result:
-+    { echo "$as_me:$LINENO: result:
-                    archdir $RUBY_ARCHDIR,
-                    sitearchdir $RUBY_SITEARCHDIR,
-                    sitedir $RUBY_SITEDIR,
-@@ -56977,7 +62785,7 @@
-                    includedir $RUBY_INCLUDEDIR,
-                    libdir $RUBY_LIBDIR,
-                    librubyarg $RUBY_LIBRUBYARG,
--                   rubysharedenabled $RUBY_ENABLESHARED" >&6
-+                   rubysharedenabled $RUBY_ENABLESHARED" >&6; }
- 
- 
- 
-@@ -56986,8 +62794,8 @@
- 
- 
- 
--    echo "$as_me:$LINENO: checking for Ruby header" >&5
--echo $ECHO_N "checking for Ruby header... $ECHO_C" >&6
-+    { echo "$as_me:$LINENO: checking for Ruby header" >&5
-+echo $ECHO_N "checking for Ruby header... $ECHO_C" >&6; }
- 
-     if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
-       # if $RUBY_INCLUDEDIR is not valid try to use $RUBY_ARCHDIR
-@@ -56996,32 +62804,31 @@
- 
-     if test ! -r $RUBY_INCLUDEDIR/ruby.h; then
-       RUBY_LIBDIR=""
--      echo "$as_me:$LINENO: result: not found" >&5
--echo "${ECHO_T}not found" >&6
-+      { echo "$as_me:$LINENO: result: not found" >&5
-+echo "${ECHO_T}not found" >&6; }
-     else
--      echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6 # header
-+      { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; } # header
- 
--      echo "$as_me:$LINENO: checking Ruby shared library" >&5
--echo $ECHO_N "checking Ruby shared library... $ECHO_C" >&6
-+      { echo "$as_me:$LINENO: checking Ruby shared library" >&5
-+echo $ECHO_N "checking Ruby shared library... $ECHO_C" >&6; }
-       if test "x$RUBY_ENABLESHARED" != "xyes" ; then
--        echo "$as_me:$LINENO: result: shared library not found" >&5
--echo "${ECHO_T}shared library not found" >&6
-+        { echo "$as_me:$LINENO: result: shared library not found" >&5
-+echo "${ECHO_T}shared library not found" >&6; }
-         RUBY_LIBDIR=""
-       else
-         if test -z "$RUBY_LIBRUBYARG" ; then
--          echo "$as_me:$LINENO: result: link argument not found" >&5
--echo "${ECHO_T}link argument not found" >&6
-+          { echo "$as_me:$LINENO: result: link argument not found" >&5
-+echo "${ECHO_T}link argument not found" >&6; }
-           RUBY_LIBDIR=""
-         else
--          echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6 # shared library link arg
--
--          echo "$as_me:$LINENO: checking if C++ program with ruby can be compiled" >&5
--echo $ECHO_N "checking if C++ program with ruby can be compiled... $ECHO_C" >&6
-+          { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; } # shared library link arg
- 
-+          { echo "$as_me:$LINENO: checking if C++ program with ruby can be compiled" >&5
-+echo $ECHO_N "checking if C++ program with ruby can be compiled... $ECHO_C" >&6; }
- 
--           ac_ext=cc
-+           ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -57063,23 +62870,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -57088,14 +62908,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ruby_build=no
-+	ruby_build=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
--          echo "$as_me:$LINENO: result: $ruby_build" >&5
--echo "${ECHO_T}$ruby_build" >&6
-+          { echo "$as_me:$LINENO: result: $ruby_build" >&5
-+echo "${ECHO_T}$ruby_build" >&6; }
-           if test "$ruby_build" = "no"; then
-             RUBY_LIBDIR=""
-           fi
-@@ -57143,8 +62964,8 @@
- fi
- 
- for i in $ac_topsubdirs; do
--  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
--echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking if $i should be compiled" >&5
-+echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; }
-   if test -d $srcdir/$i; then
-     install_it="yes"
-     for j in $DO_NOT_COMPILE; do
-@@ -57155,8 +62976,8 @@
-   else
-     install_it="no"
-   fi
--  echo "$as_me:$LINENO: result: $install_it" >&5
--echo "${ECHO_T}$install_it" >&6
-+  { echo "$as_me:$LINENO: result: $install_it" >&5
-+echo "${ECHO_T}$install_it" >&6; }
-   vari=`echo $i | sed -e 's,[-+.@],_,g'`
-   if test $install_it = "yes"; then
-     TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -57428,1014 +63249,1014 @@
-   filters_SUBDIR_included_FALSE=
- fi
- 
--          ac_config_files="$ac_config_files Makefile"
-+ac_config_files="$ac_config_files Makefile"
- 
--          ac_config_files="$ac_config_files autocorrect/Makefile"
-+ac_config_files="$ac_config_files autocorrect/Makefile"
- 
--          ac_config_files="$ac_config_files doc/Makefile"
-+ac_config_files="$ac_config_files doc/Makefile"
- 
--          ac_config_files="$ac_config_files doc/karbon/Makefile"
-+ac_config_files="$ac_config_files doc/karbon/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kchart/Makefile"
-+ac_config_files="$ac_config_files doc/kchart/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kexi/Makefile"
-+ac_config_files="$ac_config_files doc/kexi/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kformula/Makefile"
-+ac_config_files="$ac_config_files doc/kformula/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kivio/Makefile"
-+ac_config_files="$ac_config_files doc/kivio/Makefile"
- 
--          ac_config_files="$ac_config_files doc/koffice/Makefile"
-+ac_config_files="$ac_config_files doc/koffice/Makefile"
- 
--          ac_config_files="$ac_config_files doc/koshell/Makefile"
-+ac_config_files="$ac_config_files doc/koshell/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kplato/Makefile"
-+ac_config_files="$ac_config_files doc/kplato/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kpresenter/Makefile"
-+ac_config_files="$ac_config_files doc/kpresenter/Makefile"
- 
--          ac_config_files="$ac_config_files doc/krita/Makefile"
-+ac_config_files="$ac_config_files doc/krita/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kspread/Makefile"
-+ac_config_files="$ac_config_files doc/kspread/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kugar/Makefile"
-+ac_config_files="$ac_config_files doc/kugar/Makefile"
- 
--          ac_config_files="$ac_config_files doc/kword/Makefile"
-+ac_config_files="$ac_config_files doc/kword/Makefile"
- 
--          ac_config_files="$ac_config_files doc/thesaurus/Makefile"
-+ac_config_files="$ac_config_files doc/thesaurus/Makefile"
- 
--          ac_config_files="$ac_config_files example/Makefile"
-+ac_config_files="$ac_config_files example/Makefile"
- 
--          ac_config_files="$ac_config_files filters/Makefile"
-+ac_config_files="$ac_config_files filters/Makefile"
- 
--          ac_config_files="$ac_config_files filters/generic_wrapper/Makefile"
-+ac_config_files="$ac_config_files filters/generic_wrapper/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/ai/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/ai/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/applixgraphics/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/applixgraphics/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/eps/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/eps/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/kontour/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/kontour/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/msod/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/msod/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/oodraw/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/oodraw/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/png/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/png/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/svg/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/svg/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/wmf/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/wmf/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/xaml/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/xaml/Makefile"
- 
--          ac_config_files="$ac_config_files filters/karbon/xcf/Makefile"
-+ac_config_files="$ac_config_files filters/karbon/xcf/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/bmp/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/bmp/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/jpeg/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/jpeg/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/libimageexport/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/libimageexport/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/mng/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/mng/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/png/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/png/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/svg/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/svg/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/xbm/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/xbm/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kchart/xpm/Makefile"
-+ac_config_files="$ac_config_files filters/kchart/xpm/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kformula/Makefile"
-+ac_config_files="$ac_config_files filters/kformula/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kformula/latex/Makefile"
-+ac_config_files="$ac_config_files filters/kformula/latex/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kformula/mathml/Makefile"
-+ac_config_files="$ac_config_files filters/kformula/mathml/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kformula/png/Makefile"
-+ac_config_files="$ac_config_files filters/kformula/png/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kformula/svg/Makefile"
-+ac_config_files="$ac_config_files filters/kformula/svg/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kivio/Makefile"
-+ac_config_files="$ac_config_files filters/kivio/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kivio/imageexport/Makefile"
-+ac_config_files="$ac_config_files filters/kivio/imageexport/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/bmp/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/bmp/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/jpeg/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/jpeg/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/kword/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/kword/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/libimageexport/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/libimageexport/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/magicpoint/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/magicpoint/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/mng/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/mng/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/ooimpress/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/ooimpress/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/png/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/png/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/powerpoint/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/powerpoint/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/powerpoint/import/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/powerpoint/import/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/powerpoint/libppt/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/powerpoint/libppt/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/svg/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/svg/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/xbm/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/xbm/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kpresenter/xpm/Makefile"
-+ac_config_files="$ac_config_files filters/kpresenter/xpm/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/Makefile"
-+ac_config_files="$ac_config_files filters/krita/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/jpeg/Makefile"
-+ac_config_files="$ac_config_files filters/krita/jpeg/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/libkisexif/Makefile"
-+ac_config_files="$ac_config_files filters/krita/libkisexif/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/magick/Makefile"
-+ac_config_files="$ac_config_files filters/krita/magick/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/openexr/Makefile"
-+ac_config_files="$ac_config_files filters/krita/openexr/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/png/Makefile"
-+ac_config_files="$ac_config_files filters/krita/png/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/raw/Makefile"
-+ac_config_files="$ac_config_files filters/krita/raw/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/tiff/Makefile"
-+ac_config_files="$ac_config_files filters/krita/tiff/Makefile"
- 
--          ac_config_files="$ac_config_files filters/krita/xcf/Makefile"
-+ac_config_files="$ac_config_files filters/krita/xcf/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/applixspread/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/applixspread/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/csv/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/csv/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/dbase/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/dbase/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/excel/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/excel/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/excel/import/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/excel/import/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/excel/sidewinder/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/excel/sidewinder/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/gnumeric/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/gnumeric/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/html/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/html/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/latex/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/latex/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/latex/export/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/latex/export/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/libkspreadexport/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/libkspreadexport/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/opencalc/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/opencalc/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/qpro/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/qpro/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/qpro/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/qpro/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/src/Makefile"
-+ac_config_files="$ac_config_files filters/kspread/qpro/libqpro/src/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kugar/Makefile"
-+ac_config_files="$ac_config_files filters/kugar/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kugar/kugarnop/Makefile"
-+ac_config_files="$ac_config_files filters/kugar/kugarnop/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/Makefile"
-+ac_config_files="$ac_config_files filters/kword/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/abiword/Makefile"
-+ac_config_files="$ac_config_files filters/kword/abiword/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/amipro/Makefile"
-+ac_config_files="$ac_config_files filters/kword/amipro/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/applixword/Makefile"
-+ac_config_files="$ac_config_files filters/kword/applixword/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/ascii/Makefile"
-+ac_config_files="$ac_config_files filters/kword/ascii/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/docbook/Makefile"
-+ac_config_files="$ac_config_files filters/kword/docbook/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/hancomword/Makefile"
-+ac_config_files="$ac_config_files filters/kword/hancomword/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/html/Makefile"
-+ac_config_files="$ac_config_files filters/kword/html/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/html/export/Makefile"
-+ac_config_files="$ac_config_files filters/kword/html/export/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/html/import/Makefile"
-+ac_config_files="$ac_config_files filters/kword/html/import/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/kword1.3/Makefile"
-+ac_config_files="$ac_config_files filters/kword/kword1.3/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/kword1.3/import/Makefile"
-+ac_config_files="$ac_config_files filters/kword/kword1.3/import/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/latex/Makefile"
-+ac_config_files="$ac_config_files filters/kword/latex/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/latex/export/Makefile"
-+ac_config_files="$ac_config_files filters/kword/latex/export/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/latex/import/Makefile"
-+ac_config_files="$ac_config_files filters/kword/latex/import/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/latex/import/generator/Makefile"
-+ac_config_files="$ac_config_files filters/kword/latex/import/generator/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/latex/import/parser/Makefile"
-+ac_config_files="$ac_config_files filters/kword/latex/import/parser/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/libexport/Makefile"
-+ac_config_files="$ac_config_files filters/kword/libexport/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/msword/Makefile"
-+ac_config_files="$ac_config_files filters/kword/msword/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/mswrite/Makefile"
-+ac_config_files="$ac_config_files filters/kword/mswrite/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/oowriter/Makefile"
-+ac_config_files="$ac_config_files filters/kword/oowriter/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/palmdoc/Makefile"
-+ac_config_files="$ac_config_files filters/kword/palmdoc/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/pdf/Makefile"
-+ac_config_files="$ac_config_files filters/kword/pdf/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/pdf/xpdf/Makefile"
-+ac_config_files="$ac_config_files filters/kword/pdf/xpdf/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/pdf/xpdf/goo/Makefile"
-+ac_config_files="$ac_config_files filters/kword/pdf/xpdf/goo/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/pdf/xpdf/xpdf/Makefile"
-+ac_config_files="$ac_config_files filters/kword/pdf/xpdf/xpdf/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/rtf/Makefile"
-+ac_config_files="$ac_config_files filters/kword/rtf/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/rtf/export/Makefile"
-+ac_config_files="$ac_config_files filters/kword/rtf/export/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/rtf/import/Makefile"
-+ac_config_files="$ac_config_files filters/kword/rtf/import/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/starwriter/Makefile"
-+ac_config_files="$ac_config_files filters/kword/starwriter/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/wml/Makefile"
-+ac_config_files="$ac_config_files filters/kword/wml/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/wordperfect/Makefile"
-+ac_config_files="$ac_config_files filters/kword/wordperfect/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/wordperfect/export/Makefile"
-+ac_config_files="$ac_config_files filters/kword/wordperfect/export/Makefile"
- 
--          ac_config_files="$ac_config_files filters/kword/wordperfect/import/Makefile"
-+ac_config_files="$ac_config_files filters/kword/wordperfect/import/Makefile"
- 
--          ac_config_files="$ac_config_files filters/libdialogfilter/Makefile"
-+ac_config_files="$ac_config_files filters/libdialogfilter/Makefile"
- 
--          ac_config_files="$ac_config_files filters/liboofilter/Makefile"
-+ac_config_files="$ac_config_files filters/liboofilter/Makefile"
- 
--          ac_config_files="$ac_config_files filters/xsltfilter/Makefile"
-+ac_config_files="$ac_config_files filters/xsltfilter/Makefile"
- 
--          ac_config_files="$ac_config_files filters/xsltfilter/export/Makefile"
-+ac_config_files="$ac_config_files filters/xsltfilter/export/Makefile"
- 
--          ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/Makefile"
-+ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/Makefile"
- 
--          ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/Makefile"
-+ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/Makefile"
- 
--          ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/xslfo/Makefile"
-+ac_config_files="$ac_config_files filters/xsltfilter/export/xsl/kword/xslfo/Makefile"
- 
--          ac_config_files="$ac_config_files filters/xsltfilter/import/Makefile"
-+ac_config_files="$ac_config_files filters/xsltfilter/import/Makefile"
- 
--          ac_config_files="$ac_config_files interfaces/Makefile"
-+ac_config_files="$ac_config_files interfaces/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/Makefile"
-+ac_config_files="$ac_config_files karbon/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/commands/Makefile"
-+ac_config_files="$ac_config_files karbon/commands/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/core/Makefile"
-+ac_config_files="$ac_config_files karbon/core/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/data/Makefile"
-+ac_config_files="$ac_config_files karbon/data/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/dialogs/Makefile"
-+ac_config_files="$ac_config_files karbon/dialogs/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/dockers/Makefile"
-+ac_config_files="$ac_config_files karbon/dockers/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/pics/Makefile"
-+ac_config_files="$ac_config_files karbon/pics/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/flattenpath/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/flattenpath/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/imagetool/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/imagetool/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/insertknots/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/insertknots/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/roundcorners/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/roundcorners/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/shadoweffect/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/shadoweffect/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/whirlpinch/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/whirlpinch/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/plugins/zoomtool/Makefile"
-+ac_config_files="$ac_config_files karbon/plugins/zoomtool/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/render/Makefile"
-+ac_config_files="$ac_config_files karbon/render/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/render/xrgbrender/Makefile"
-+ac_config_files="$ac_config_files karbon/render/xrgbrender/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/shapes/Makefile"
-+ac_config_files="$ac_config_files karbon/shapes/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/templates/Makefile"
-+ac_config_files="$ac_config_files karbon/templates/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/templates/basic/Makefile"
-+ac_config_files="$ac_config_files karbon/templates/basic/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/tools/Makefile"
-+ac_config_files="$ac_config_files karbon/tools/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/visitors/Makefile"
-+ac_config_files="$ac_config_files karbon/visitors/Makefile"
- 
--          ac_config_files="$ac_config_files karbon/widgets/Makefile"
-+ac_config_files="$ac_config_files karbon/widgets/Makefile"
- 
--          ac_config_files="$ac_config_files kchart/Makefile"
-+ac_config_files="$ac_config_files kchart/Makefile"
- 
--          ac_config_files="$ac_config_files kchart/kdchart/Makefile"
-+ac_config_files="$ac_config_files kchart/kdchart/Makefile"
- 
--          ac_config_files="$ac_config_files kchart/pics/Makefile"
-+ac_config_files="$ac_config_files kchart/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kchart/templates/Makefile"
-+ac_config_files="$ac_config_files kchart/templates/Makefile"
- 
--          ac_config_files="$ac_config_files kchart/toolbar/Makefile"
-+ac_config_files="$ac_config_files kchart/toolbar/Makefile"
- 
--          ac_config_files="$ac_config_files kchart/toolbar/crystalsvg/Makefile"
-+ac_config_files="$ac_config_files kchart/toolbar/crystalsvg/Makefile"
- 
--          ac_config_files="$ac_config_files kchart/toolbar/locolor/Makefile"
-+ac_config_files="$ac_config_files kchart/toolbar/locolor/Makefile"
- 
--          ac_config_files="$ac_config_files kdgantt/Makefile"
-+ac_config_files="$ac_config_files kdgantt/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/Makefile"
-+ac_config_files="$ac_config_files kexi/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/kexisql/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/kexisql/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/kexisql/src/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/kexisql/src/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/kexisql/tool/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/kexisql/tool/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/src/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/kexisql3/src/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/kolibs/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/kolibs/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/3rdparty/uuid/Makefile"
-+ac_config_files="$ac_config_files kexi/3rdparty/uuid/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/core/Makefile"
-+ac_config_files="$ac_config_files kexi/core/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/data/Makefile"
-+ac_config_files="$ac_config_files kexi/data/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/data/kde34compat/Makefile"
-+ac_config_files="$ac_config_files kexi/data/kde34compat/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/examples/Makefile"
-+ac_config_files="$ac_config_files kexi/examples/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/formeditor/Makefile"
-+ac_config_files="$ac_config_files kexi/formeditor/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/formeditor/factories/Makefile"
-+ac_config_files="$ac_config_files kexi/formeditor/factories/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/formeditor/kdevelop_plugin/Makefile"
-+ac_config_files="$ac_config_files kexi/formeditor/kdevelop_plugin/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/formeditor/scripting/Makefile"
-+ac_config_files="$ac_config_files kexi/formeditor/scripting/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/formeditor/test/Makefile"
-+ac_config_files="$ac_config_files kexi/formeditor/test/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/drivers/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/drivers/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/drivers/mySQL/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/drivers/mySQL/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/drivers/odbc/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/drivers/odbc/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/drivers/pqxx/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/drivers/pqxx/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite2/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/drivers/sqlite2/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexidb/parser/Makefile"
-+ac_config_files="$ac_config_files kexi/kexidb/parser/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/kexiutils/Makefile"
-+ac_config_files="$ac_config_files kexi/kexiutils/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/main/Makefile"
-+ac_config_files="$ac_config_files kexi/main/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/main/printing/Makefile"
-+ac_config_files="$ac_config_files kexi/main/printing/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/main/startup/Makefile"
-+ac_config_files="$ac_config_files kexi/main/startup/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/migration/Makefile"
-+ac_config_files="$ac_config_files kexi/migration/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/migration/mysql/Makefile"
-+ac_config_files="$ac_config_files kexi/migration/mysql/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/migration/pqxx/Makefile"
-+ac_config_files="$ac_config_files kexi/migration/pqxx/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/migration/txt/Makefile"
-+ac_config_files="$ac_config_files kexi/migration/txt/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/pics/Makefile"
-+ac_config_files="$ac_config_files kexi/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/forms/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/forms/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/forms/widgets/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/forms/widgets/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/importexport/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/importexport/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/importexport/csv/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/importexport/csv/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/migration/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/migration/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/queries/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/queries/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/relations/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/relations/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/reports/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/reports/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/kexiapp/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/kexiapp/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/kexidb/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/kexidb/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/kexiscripting/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/kexiscripting/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/copycenter/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/copycenter/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/exportxhtml/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/exportxhtml/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/importxhtml/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/importxhtml/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/projectdocumentor/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/projectdocumentor/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/kexiapp/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/scripting/scripts/python/kexiapp/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/plugins/tables/Makefile"
-+ac_config_files="$ac_config_files kexi/plugins/tables/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/tests/Makefile"
-+ac_config_files="$ac_config_files kexi/tests/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/tests/newapi/Makefile"
-+ac_config_files="$ac_config_files kexi/tests/newapi/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/tests/parser/Makefile"
-+ac_config_files="$ac_config_files kexi/tests/parser/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/tests/startup/Makefile"
-+ac_config_files="$ac_config_files kexi/tests/startup/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/tests/tableview/Makefile"
-+ac_config_files="$ac_config_files kexi/tests/tableview/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/tests/widgets/Makefile"
-+ac_config_files="$ac_config_files kexi/tests/widgets/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/widget/Makefile"
-+ac_config_files="$ac_config_files kexi/widget/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/widget/relations/Makefile"
-+ac_config_files="$ac_config_files kexi/widget/relations/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/widget/tableview/Makefile"
-+ac_config_files="$ac_config_files kexi/widget/tableview/Makefile"
- 
--          ac_config_files="$ac_config_files kexi/widget/utils/Makefile"
-+ac_config_files="$ac_config_files kexi/widget/utils/Makefile"
- 
--          ac_config_files="$ac_config_files kformula/Makefile"
-+ac_config_files="$ac_config_files kformula/Makefile"
- 
--          ac_config_files="$ac_config_files kformula/pics/Makefile"
-+ac_config_files="$ac_config_files kformula/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/Makefile"
-+ac_config_files="$ac_config_files kivio/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/config/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/config/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/kiviosdk/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/kiviosdk/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/pics/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Assorted/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Assorted/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Circuit/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Circuit/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Cisco/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Cisco/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Civil/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Civil/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Contact/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Contact/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Electric/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Electric/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Jigsaw/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Jigsaw/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/MSE/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/MSE/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Network/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Network/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Pneumatic/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Pneumatic/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/SDL/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/SDL/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Sybase/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Dia/Sybase/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Extended/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Extended/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Logic/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Flowcharting/Logic/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Flags/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Flags/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Maps/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Geographic/Maps/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Computer/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Computer/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/ER/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/ER/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/People/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/People/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/tiles/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/tiles/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/tools/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/tools/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/kiviopart/ui/Makefile"
-+ac_config_files="$ac_config_files kivio/kiviopart/ui/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/straight_connector/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kivioconnectortool/straight_connector/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/select_pics/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kivioselecttool/select_pics/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/sml_connector/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kiviosmlconnector/sml_connector/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kiviotargettool/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kiviotargettool/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kiviotexttool/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kiviotexttool/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/zoom_pics/Makefile"
-+ac_config_files="$ac_config_files kivio/plugins/kiviozoomtool/zoom_pics/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/templates/Makefile"
-+ac_config_files="$ac_config_files kivio/templates/Makefile"
- 
--          ac_config_files="$ac_config_files kivio/templates/basic/Makefile"
-+ac_config_files="$ac_config_files kivio/templates/basic/Makefile"
- 
--          ac_config_files="$ac_config_files koshell/Makefile"
-+ac_config_files="$ac_config_files koshell/Makefile"
- 
--          ac_config_files="$ac_config_files kounavail/Makefile"
-+ac_config_files="$ac_config_files kounavail/Makefile"
- 
--          ac_config_files="$ac_config_files kplato/Makefile"
-+ac_config_files="$ac_config_files kplato/Makefile"
- 
--          ac_config_files="$ac_config_files kplato/pics/Makefile"
-+ac_config_files="$ac_config_files kplato/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kplato/reports/Makefile"
-+ac_config_files="$ac_config_files kplato/reports/Makefile"
- 
--          ac_config_files="$ac_config_files kplato/templates/Makefile"
-+ac_config_files="$ac_config_files kplato/templates/Makefile"
- 
--          ac_config_files="$ac_config_files kplato/templates/Simple/Makefile"
-+ac_config_files="$ac_config_files kplato/templates/Simple/Makefile"
- 
--          ac_config_files="$ac_config_files kplato/tests/Makefile"
-+ac_config_files="$ac_config_files kplato/tests/Makefile"
- 
--          ac_config_files="$ac_config_files kplato/toolbar/Makefile"
-+ac_config_files="$ac_config_files kplato/toolbar/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/Makefile"
-+ac_config_files="$ac_config_files kpresenter/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/autoformEdit/Makefile"
-+ac_config_files="$ac_config_files kpresenter/autoformEdit/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/autoforms/Makefile"
-+ac_config_files="$ac_config_files kpresenter/autoforms/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/autoforms/Arrows/Makefile"
-+ac_config_files="$ac_config_files kpresenter/autoforms/Arrows/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/autoforms/Connections/Makefile"
-+ac_config_files="$ac_config_files kpresenter/autoforms/Connections/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/dtd/Makefile"
-+ac_config_files="$ac_config_files kpresenter/dtd/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/pics/Makefile"
-+ac_config_files="$ac_config_files kpresenter/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/pics/rotate/Makefile"
-+ac_config_files="$ac_config_files kpresenter/pics/rotate/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/slideshow/Makefile"
-+ac_config_files="$ac_config_files kpresenter/slideshow/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/templates/Makefile"
-+ac_config_files="$ac_config_files kpresenter/templates/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/templates/A4/Makefile"
-+ac_config_files="$ac_config_files kpresenter/templates/A4/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/templates/Screen/Makefile"
-+ac_config_files="$ac_config_files kpresenter/templates/Screen/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/templates/Screenpresentations/Makefile"
-+ac_config_files="$ac_config_files kpresenter/templates/Screenpresentations/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/templates/common_icon/Makefile"
-+ac_config_files="$ac_config_files kpresenter/templates/common_icon/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/templates/legal/Makefile"
-+ac_config_files="$ac_config_files kpresenter/templates/legal/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/templates/letter/Makefile"
-+ac_config_files="$ac_config_files kpresenter/templates/letter/Makefile"
- 
--          ac_config_files="$ac_config_files kpresenter/toolbar/Makefile"
-+ac_config_files="$ac_config_files kpresenter/toolbar/Makefile"
- 
--          ac_config_files="$ac_config_files krita/Makefile"
-+ac_config_files="$ac_config_files krita/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/cmyk_u16/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/cmyk_u16/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/templates/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/cmyk_u8/templates/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/gray_u16/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/gray_u16/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/gray_u8/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/gray_u8/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/gray_u8/templates/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/gray_u8/templates/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/gray_u8/tests/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/gray_u8/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/lms_f32/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/lms_f32/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/tests/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_f16half/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/tests/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_f32/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/tests/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_u16/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/templates/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/templates/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/tests/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/rgb_u8/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/wet/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/wet/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/wetsticky/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/wetsticky/Makefile"
- 
--          ac_config_files="$ac_config_files krita/colorspaces/wetsticky/brushop/Makefile"
-+ac_config_files="$ac_config_files krita/colorspaces/wetsticky/brushop/Makefile"
- 
--          ac_config_files="$ac_config_files krita/core/Makefile"
-+ac_config_files="$ac_config_files krita/core/Makefile"
- 
--          ac_config_files="$ac_config_files krita/core/tests/Makefile"
-+ac_config_files="$ac_config_files krita/core/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/core/tiles/Makefile"
-+ac_config_files="$ac_config_files krita/core/tiles/Makefile"
- 
--          ac_config_files="$ac_config_files krita/core/tiles/tests/Makefile"
-+ac_config_files="$ac_config_files krita/core/tiles/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/data/Makefile"
-+ac_config_files="$ac_config_files krita/data/Makefile"
- 
--          ac_config_files="$ac_config_files krita/data/brushes/Makefile"
-+ac_config_files="$ac_config_files krita/data/brushes/Makefile"
- 
--          ac_config_files="$ac_config_files krita/data/gradients/Makefile"
-+ac_config_files="$ac_config_files krita/data/gradients/Makefile"
- 
--          ac_config_files="$ac_config_files krita/data/images/Makefile"
-+ac_config_files="$ac_config_files krita/data/images/Makefile"
- 
--          ac_config_files="$ac_config_files krita/data/palettes/Makefile"
-+ac_config_files="$ac_config_files krita/data/palettes/Makefile"
- 
--          ac_config_files="$ac_config_files krita/data/patterns/Makefile"
-+ac_config_files="$ac_config_files krita/data/patterns/Makefile"
- 
--          ac_config_files="$ac_config_files krita/data/profiles/Makefile"
-+ac_config_files="$ac_config_files krita/data/profiles/Makefile"
- 
--          ac_config_files="$ac_config_files krita/dtd/Makefile"
-+ac_config_files="$ac_config_files krita/dtd/Makefile"
- 
--          ac_config_files="$ac_config_files krita/kritacolor/Makefile"
-+ac_config_files="$ac_config_files krita/kritacolor/Makefile"
- 
--          ac_config_files="$ac_config_files krita/kritacolor/colorspaces/Makefile"
-+ac_config_files="$ac_config_files krita/kritacolor/colorspaces/Makefile"
- 
--          ac_config_files="$ac_config_files krita/kritacolor/tests/Makefile"
-+ac_config_files="$ac_config_files krita/kritacolor/tests/Makefile"
- 
--          ac_config_files="$ac_config_files krita/pics/Makefile"
-+ac_config_files="$ac_config_files krita/pics/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/bumpmap/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/bumpmap/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/cimg/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/cimg/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/colorsfilters/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/colorsfilters/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/convolutionfilters/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/convolutionfilters/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/cubismfilter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/cubismfilter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/embossfilter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/embossfilter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/example/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/example/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/imageenhancement/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/imageenhancement/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/oilpaintfilter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/oilpaintfilter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/pixelizefilter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/pixelizefilter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/raindropsfilter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/raindropsfilter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/roundcorners/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/roundcorners/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/smalltilesfilter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/smalltilesfilter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/sobelfilter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/sobelfilter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/filters/threadtest/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/filters/threadtest/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/paintops/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/paintops/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/paintops/defaultpaintops/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/paintops/defaultpaintops/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/paintops/smearybrush/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/paintops/smearybrush/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/defaulttools/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/defaulttools/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/selectiontools/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/selectiontools/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/tool_crop/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/tool_crop/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/tool_filter/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/tool_filter/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/tool_polygon/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/tool_polygon/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/tool_polyline/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/tool_polyline/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/tool_selectsimilar/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/tool_selectsimilar/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/tool_star/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/tool_star/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/tools/tool_transform/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/tools/tool_transform/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/colorrange/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/colorrange/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/colorspaceconversion/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/colorspaceconversion/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/dropshadow/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/dropshadow/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/filtersgallery/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/filtersgallery/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram_docker/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/histogram_docker/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/history_docker/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/history_docker/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/imagesize/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/imagesize/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/performancetest/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/performancetest/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/rotateimage/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/rotateimage/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/screenshot/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/screenshot/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritacore/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritacore/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritascripting/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/kritascripting/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/python/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/python/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/ruby/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/scripting/samples/ruby/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/separate_channels/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/separate_channels/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/shearimage/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/shearimage/Makefile"
- 
--          ac_config_files="$ac_config_files krita/plugins/viewplugins/variations/Makefile"
-+ac_config_files="$ac_config_files krita/plugins/viewplugins/variations/Makefile"
- 
--          ac_config_files="$ac_config_files krita/sdk/Makefile"
-+ac_config_files="$ac_config_files krita/sdk/Makefile"
- 
--          ac_config_files="$ac_config_files krita/ui/Makefile"
-+ac_config_files="$ac_config_files krita/ui/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/Makefile"
-+ac_config_files="$ac_config_files kspread/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/dialogs/Makefile"
-+ac_config_files="$ac_config_files kspread/dialogs/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/dtd/Makefile"
-+ac_config_files="$ac_config_files kspread/dtd/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/extensions/Makefile"
-+ac_config_files="$ac_config_files kspread/extensions/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/pics/Makefile"
-+ac_config_files="$ac_config_files kspread/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/plugins/Makefile"
-+ac_config_files="$ac_config_files kspread/plugins/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/plugins/calculator/Makefile"
-+ac_config_files="$ac_config_files kspread/plugins/calculator/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/plugins/calculator/pics/Makefile"
-+ac_config_files="$ac_config_files kspread/plugins/calculator/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/plugins/insertcalendar/Makefile"
-+ac_config_files="$ac_config_files kspread/plugins/insertcalendar/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/sheetstyles/Makefile"
-+ac_config_files="$ac_config_files kspread/sheetstyles/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/templates/Makefile"
-+ac_config_files="$ac_config_files kspread/templates/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/templates/Business/Makefile"
-+ac_config_files="$ac_config_files kspread/templates/Business/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/templates/General/Makefile"
-+ac_config_files="$ac_config_files kspread/templates/General/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/templates/HomeFamily/Makefile"
-+ac_config_files="$ac_config_files kspread/templates/HomeFamily/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/tests/Makefile"
-+ac_config_files="$ac_config_files kspread/tests/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/toolbar/Makefile"
-+ac_config_files="$ac_config_files kspread/toolbar/Makefile"
- 
--          ac_config_files="$ac_config_files kspread/toolbar/crystalsvg/Makefile"
-+ac_config_files="$ac_config_files kspread/toolbar/crystalsvg/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/Makefile"
-+ac_config_files="$ac_config_files kugar/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/kudesigner/Makefile"
-+ac_config_files="$ac_config_files kugar/kudesigner/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/kudesigner/pics/Makefile"
-+ac_config_files="$ac_config_files kugar/kudesigner/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/kudesigner/templates/Makefile"
-+ac_config_files="$ac_config_files kugar/kudesigner/templates/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/kudesigner/templates/General/Makefile"
-+ac_config_files="$ac_config_files kugar/kudesigner/templates/General/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/kudesigner/toolbar/Makefile"
-+ac_config_files="$ac_config_files kugar/kudesigner/toolbar/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/kudesigner_lib/Makefile"
-+ac_config_files="$ac_config_files kugar/kudesigner_lib/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/lib/Makefile"
-+ac_config_files="$ac_config_files kugar/lib/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/part/Makefile"
-+ac_config_files="$ac_config_files kugar/part/Makefile"
- 
--          ac_config_files="$ac_config_files kugar/samples/Makefile"
-+ac_config_files="$ac_config_files kugar/samples/Makefile"
- 
--          ac_config_files="$ac_config_files kword/Makefile"
-+ac_config_files="$ac_config_files kword/Makefile"
- 
--          ac_config_files="$ac_config_files kword/data/Makefile"
-+ac_config_files="$ac_config_files kword/data/Makefile"
- 
--          ac_config_files="$ac_config_files kword/dtd/Makefile"
-+ac_config_files="$ac_config_files kword/dtd/Makefile"
- 
--          ac_config_files="$ac_config_files kword/expression/Makefile"
-+ac_config_files="$ac_config_files kword/expression/Makefile"
- 
--          ac_config_files="$ac_config_files kword/horizontalline/Makefile"
-+ac_config_files="$ac_config_files kword/horizontalline/Makefile"
- 
--          ac_config_files="$ac_config_files kword/mailmerge/Makefile"
-+ac_config_files="$ac_config_files kword/mailmerge/Makefile"
- 
--          ac_config_files="$ac_config_files kword/mailmerge/kabc/Makefile"
-+ac_config_files="$ac_config_files kword/mailmerge/kabc/Makefile"
- 
--          ac_config_files="$ac_config_files kword/mailmerge/kspread/Makefile"
-+ac_config_files="$ac_config_files kword/mailmerge/kspread/Makefile"
- 
--          ac_config_files="$ac_config_files kword/mailmerge/sql/Makefile"
-+ac_config_files="$ac_config_files kword/mailmerge/sql/Makefile"
- 
--          ac_config_files="$ac_config_files kword/pics/Makefile"
-+ac_config_files="$ac_config_files kword/pics/Makefile"
- 
--          ac_config_files="$ac_config_files kword/templates/Makefile"
-+ac_config_files="$ac_config_files kword/templates/Makefile"
- 
--          ac_config_files="$ac_config_files kword/templates/CardsAndLabels/Makefile"
-+ac_config_files="$ac_config_files kword/templates/CardsAndLabels/Makefile"
- 
--          ac_config_files="$ac_config_files kword/templates/Envelopes/Makefile"
-+ac_config_files="$ac_config_files kword/templates/Envelopes/Makefile"
- 
--          ac_config_files="$ac_config_files kword/templates/Wordprocessing/Makefile"
-+ac_config_files="$ac_config_files kword/templates/Wordprocessing/Makefile"
- 
--          ac_config_files="$ac_config_files kword/tests/Makefile"
-+ac_config_files="$ac_config_files kword/tests/Makefile"
- 
--          ac_config_files="$ac_config_files kword/toolbar/Makefile"
-+ac_config_files="$ac_config_files kword/toolbar/Makefile"
- 
--          ac_config_files="$ac_config_files lib/Makefile"
-+ac_config_files="$ac_config_files lib/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kformula/Makefile"
-+ac_config_files="$ac_config_files lib/kformula/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kformula/config/Makefile"
-+ac_config_files="$ac_config_files lib/kformula/config/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kformula/dtd/Makefile"
-+ac_config_files="$ac_config_files lib/kformula/dtd/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kformula/fonts/Makefile"
-+ac_config_files="$ac_config_files lib/kformula/fonts/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kformula/pics/Makefile"
-+ac_config_files="$ac_config_files lib/kformula/pics/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kformula/pics/crystalsvg/Makefile"
-+ac_config_files="$ac_config_files lib/kformula/pics/crystalsvg/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kofficecore/Makefile"
-+ac_config_files="$ac_config_files lib/kofficecore/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kofficecore/tests/Makefile"
-+ac_config_files="$ac_config_files lib/kofficecore/tests/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kofficeui/Makefile"
-+ac_config_files="$ac_config_files lib/kofficeui/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kofficeui/pics/Makefile"
-+ac_config_files="$ac_config_files lib/kofficeui/pics/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kofficeui/tests/Makefile"
-+ac_config_files="$ac_config_files lib/kofficeui/tests/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kopainter/Makefile"
-+ac_config_files="$ac_config_files lib/kopainter/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kopalette/Makefile"
-+ac_config_files="$ac_config_files lib/kopalette/Makefile"
- 
--          ac_config_files="$ac_config_files lib/koproperty/Makefile"
-+ac_config_files="$ac_config_files lib/koproperty/Makefile"
- 
--          ac_config_files="$ac_config_files lib/koproperty/editors/Makefile"
-+ac_config_files="$ac_config_files lib/koproperty/editors/Makefile"
- 
--          ac_config_files="$ac_config_files lib/koproperty/test/Makefile"
-+ac_config_files="$ac_config_files lib/koproperty/test/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kotext/Makefile"
-+ac_config_files="$ac_config_files lib/kotext/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kotext/kohyphen/Makefile"
-+ac_config_files="$ac_config_files lib/kotext/kohyphen/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kotext/kohyphen/hyphdicts/Makefile"
-+ac_config_files="$ac_config_files lib/kotext/kohyphen/hyphdicts/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kotext/tests/Makefile"
-+ac_config_files="$ac_config_files lib/kotext/tests/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/Makefile"
-+ac_config_files="$ac_config_files lib/kross/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/api/Makefile"
-+ac_config_files="$ac_config_files lib/kross/api/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/main/Makefile"
-+ac_config_files="$ac_config_files lib/kross/main/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/python/Makefile"
-+ac_config_files="$ac_config_files lib/kross/python/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/python/CXX/Makefile"
-+ac_config_files="$ac_config_files lib/kross/python/CXX/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/python/scripts/Makefile"
-+ac_config_files="$ac_config_files lib/kross/python/scripts/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/python/scripts/RestrictedPython/Makefile"
-+ac_config_files="$ac_config_files lib/kross/python/scripts/RestrictedPython/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/ruby/Makefile"
-+ac_config_files="$ac_config_files lib/kross/ruby/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/runner/Makefile"
-+ac_config_files="$ac_config_files lib/kross/runner/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kross/test/Makefile"
-+ac_config_files="$ac_config_files lib/kross/test/Makefile"
- 
--          ac_config_files="$ac_config_files lib/kwmf/Makefile"
-+ac_config_files="$ac_config_files lib/kwmf/Makefile"
- 
--          ac_config_files="$ac_config_files lib/store/Makefile"
-+ac_config_files="$ac_config_files lib/store/Makefile"
- 
--          ac_config_files="$ac_config_files lib/store/tests/Makefile"
-+ac_config_files="$ac_config_files lib/store/tests/Makefile"
- 
--          ac_config_files="$ac_config_files mimetypes/Makefile"
-+ac_config_files="$ac_config_files mimetypes/Makefile"
- 
--          ac_config_files="$ac_config_files mimetypes/kde33/Makefile"
-+ac_config_files="$ac_config_files mimetypes/kde33/Makefile"
- 
--          ac_config_files="$ac_config_files mimetypes/kde351/Makefile"
-+ac_config_files="$ac_config_files mimetypes/kde351/Makefile"
- 
--          ac_config_files="$ac_config_files pics/Makefile"
-+ac_config_files="$ac_config_files pics/Makefile"
- 
--          ac_config_files="$ac_config_files pics/crystalsvg/Makefile"
-+ac_config_files="$ac_config_files pics/crystalsvg/Makefile"
- 
--          ac_config_files="$ac_config_files plugins/Makefile"
-+ac_config_files="$ac_config_files plugins/Makefile"
- 
--          ac_config_files="$ac_config_files plugins/scan/Makefile"
-+ac_config_files="$ac_config_files plugins/scan/Makefile"
- 
--          ac_config_files="$ac_config_files servicetypes/Makefile"
-+ac_config_files="$ac_config_files servicetypes/Makefile"
- 
--          ac_config_files="$ac_config_files templates/Makefile"
-+ac_config_files="$ac_config_files templates/Makefile"
- 
--          ac_config_files="$ac_config_files tools/Makefile"
-+ac_config_files="$ac_config_files tools/Makefile"
- 
--          ac_config_files="$ac_config_files tools/converter/Makefile"
-+ac_config_files="$ac_config_files tools/converter/Makefile"
- 
--          ac_config_files="$ac_config_files tools/kfile-plugins/Makefile"
-+ac_config_files="$ac_config_files tools/kfile-plugins/Makefile"
- 
--          ac_config_files="$ac_config_files tools/kfile-plugins/abiword/Makefile"
-+ac_config_files="$ac_config_files tools/kfile-plugins/abiword/Makefile"
- 
--          ac_config_files="$ac_config_files tools/kfile-plugins/gnumeric/Makefile"
-+ac_config_files="$ac_config_files tools/kfile-plugins/gnumeric/Makefile"
- 
--          ac_config_files="$ac_config_files tools/kfile-plugins/koffice/Makefile"
-+ac_config_files="$ac_config_files tools/kfile-plugins/koffice/Makefile"
- 
--          ac_config_files="$ac_config_files tools/kfile-plugins/ooo/Makefile"
-+ac_config_files="$ac_config_files tools/kfile-plugins/ooo/Makefile"
- 
--          ac_config_files="$ac_config_files tools/kthesaurus/Makefile"
-+ac_config_files="$ac_config_files tools/kthesaurus/Makefile"
- 
--          ac_config_files="$ac_config_files tools/quickprint/Makefile"
-+ac_config_files="$ac_config_files tools/quickprint/Makefile"
- 
--          ac_config_files="$ac_config_files tools/spell/Makefile"
-+ac_config_files="$ac_config_files tools/spell/Makefile"
- 
--          ac_config_files="$ac_config_files tools/thesaurus/Makefile"
-+ac_config_files="$ac_config_files tools/thesaurus/Makefile"
- 
--          ac_config_files="$ac_config_files tools/thumbnail/Makefile"
-+ac_config_files="$ac_config_files tools/thumbnail/Makefile"
- 
--echo "$as_me:$LINENO: checking for filters to be compiled" >&5
--echo $ECHO_N "checking for filters to be compiled... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for filters to be compiled" >&5
-+echo $ECHO_N "checking for filters to be compiled... $ECHO_C" >&6; }
- 
- if test -s $srcdir/inst-apps ; then
-     SUBDIRLIST=`cat $srcdir/inst-apps`
-@@ -58479,8 +64300,8 @@
- done
- 
- USERFEEDBACKCOMPILE="$COMPILE_FILTER_KWORD$COMPILE_FILTER_KSPREAD$COMPILE_FILTER_KCHART$COMPILE_FILTER_KARBON$COMPILE_FILTER_KPRESENTER$COMPILE_FILTER_KFORMULA$COMPILE_FILTER_KUGAR"
--echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILE" >&5
--echo "${ECHO_T}$USERFEEDBACKCOMPILE" >&6
-+{ echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILE" >&5
-+echo "${ECHO_T}$USERFEEDBACKCOMPILE" >&6; }
- 
- 
- 
-@@ -58619,8 +64440,8 @@
-     SUBDIRLIST=`ls -1 $srcdir`
- fi
- 
--echo "$as_me:$LINENO: checking whether only Kexi is being built" >&5
--echo $ECHO_N "checking whether only Kexi is being built... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether only Kexi is being built" >&5
-+echo $ECHO_N "checking whether only Kexi is being built... $ECHO_C" >&6; }
- KEXI_ONLY=yes
- for args in $SUBDIRLIST ; do
-     case $args in
-@@ -58632,8 +64453,8 @@
-            ;;
-     esac
- done
--echo "$as_me:$LINENO: result: $KEXI_ONLY" >&5
--echo "${ECHO_T}$KEXI_ONLY" >&6
-+{ echo "$as_me:$LINENO: result: $KEXI_ONLY" >&5
-+echo "${ECHO_T}$KEXI_ONLY" >&6; }
- 
- 
- if test "$KEXI_ONLY" = "yes" ; then
-@@ -58645,8 +64466,8 @@
- fi
- 
- 
--echo "$as_me:$LINENO: checking whether kopainter should be compiled" >&5
--echo $ECHO_N "checking whether kopainter should be compiled... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether kopainter should be compiled" >&5
-+echo $ECHO_N "checking whether kopainter should be compiled... $ECHO_C" >&6; }
- 
- 
- # first check which main application we could compile
-@@ -58673,8 +64494,8 @@
-     USERFEEDBACKCOMPILELIB="no"
- fi
- 
--echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILELIB" >&5
--echo "${ECHO_T}$USERFEEDBACKCOMPILELIB" >&6
-+{ echo "$as_me:$LINENO: result: $USERFEEDBACKCOMPILELIB" >&5
-+echo "${ECHO_T}$USERFEEDBACKCOMPILELIB" >&6; }
- 
- 
- 
-@@ -58705,39 +64526,58 @@
- 
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      *) $as_unset $ac_var ;;
-+      esac ;;
-+    esac
-+  done
-+
-   (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       # `set' does not quote correctly, so add quotes (double-quote
-       # substitution turns \\\\ into \\, and sed turns \\ into \).
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
-+      ;; #(
-     *)
-       # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--} |
-+    esac |
-+    sort
-+) |
-   sed '
-+     /^ac_cv_env_/b end
-      t clear
--     : clear
-+     :clear
-      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-      t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    echo "not updating unwritable cache $cache_file"
-+    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -58746,38 +64586,31 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- 
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[	 ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[	 ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
- 
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-   # 1. Remove the extension, and $U if already installed.
--  ac_i=`echo "$ac_i" |
--	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
--  # 2. Add them.
--  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
--  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
- 
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ CFLAGS="$kde_save_cflags"
+ LIBS="$kde_save_libs"
+@@ -69067,6 +68803,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -58384,3880 +19230,160 @@
  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
-@@ -59306,11 +65139,35 @@
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -59319,8 +65176,43 @@
- fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -59334,18 +65226,19 @@
-   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -59353,159 +65246,120 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
-+# CDPATH.
-+$as_unset CDPATH
- 
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
- 
-   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-   # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
-+  # line-number line after each line using $LINENO; the second 'sed'
-+  # does the real work.  The second script uses 'N' to pair each
-+  # line-number line with the line containing $LINENO, and appends
-+  # trailing '-' during substitution so that $LINENO is not a special
-+  # case at line end.
-   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
-+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-+  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  sed -n '
-+    p
-+    /[$]LINENO/=
-+  ' <$as_myself |
-     sed '
-+      s/[$]LINENO.*/&-/
-+      t lineno
-+      b
-+      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+      :loop
-+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
-+      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+  chmod +x "$as_me.lineno" ||
-+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
- }
- 
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+  case `echo 'x\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  *)   ECHO_C='\c';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
- esac
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
-+  as_ln_s='ln -s'
-+  # ... but there are two gotchas:
-+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+  # In both cases, we have to default to `cp -p'.
-+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-     as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
-   as_ln_s=ln
- else
-   as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
-@@ -59514,7 +65368,19 @@
-   as_mkdir_p=false
- fi
- 
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
-+else
-+  as_executable_p=:
-+fi
-+rm -f conf$$.file
- 
- # 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'"
-@@ -59523,31 +65389,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
- 
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling.  Logging --version etc. is OK.
--exec 5>>config.log
--{
--  echo
--  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
+@@ -69894,7 +69637,7 @@
+ # values after options handling.
+ 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.59e.  Invocation command line was
+-generated by GNU Autoconf 2.60.  Invocation command line was
++generated by GNU Autoconf 2.60a.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -59555,30 +65404,20 @@
-   CONFIG_COMMANDS = $CONFIG_COMMANDS
-   $ $0 $@
+@@ -69923,7 +69666,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
  
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
- 
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
--  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
- 
--if test -n "$ac_config_headers"; then
--  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
--  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_commands"; then
--  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -59605,19 +65444,21 @@
- $config_commands
- 
- Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
- 
-+_ACEOF
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
++  -V, --version    print version number and configuration settings, then exit
+   -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+@@ -69947,7 +69690,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  config.status
--configured by $0, generated by GNU Autoconf 2.59,
--  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.59e,
-+  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+-configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.60a,
+   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -59628,39 +65469,24 @@
- do
-   case $1 in
-   --*=*)
--    ac_option=`expr "x$1" : 'x\([^=]*\)='`
--    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-     ac_shift=:
-     ;;
--  -*)
-+  *)
-     ac_option=$1
-     ac_optarg=$2
-     ac_shift=shift
-     ;;
--  *) # This is not an option, so the user has probably given explicit
--     # arguments.
--     ac_option=$1
--     ac_need_defaults=false;;
-   esac
- 
-   case $ac_option in
-   # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     ac_cs_recheck=: ;;
--  --version | --vers* | -V )
--    echo "$ac_cs_version"; exit 0 ;;
--  --he | --h)
--    # Conflict between --help and --header
--    { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
--  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit 0 ;;
--  --debug | --d* | -d )
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    echo "$ac_cs_version"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-     $ac_shift
-@@ -59670,18 +65496,24 @@
-     $ac_shift
-     CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-     ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+   { (exit 1); exit 1; }; };;
-+  --help | --hel | -h )
-+    echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil | --si | --s)
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+  -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
--  *) ac_config_targets="$ac_config_targets $1" ;;
-+  *) ac_config_targets="$ac_config_targets $1"
-+     ac_need_defaults=false ;;
- 
-   esac
-   shift
-@@ -59697,539 +65529,551 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
--  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+  CONFIG_SHELL=$SHELL
-+  export CONFIG_SHELL
-+  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
- 
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+  echo "$ac_log"
-+} >&5
- 
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- #
--# INIT-COMMANDS section.
-+# INIT-COMMANDS
- #
--
- AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
- _ACEOF
- 
--
--
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
--  case "$ac_config_target" in
--  # Handling of arguments.
--  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--  "autocorrect/Makefile" ) CONFIG_FILES="$CONFIG_FILES autocorrect/Makefile" ;;
--  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
--  "doc/karbon/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/karbon/Makefile" ;;
--  "doc/kchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kchart/Makefile" ;;
--  "doc/kexi/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kexi/Makefile" ;;
--  "doc/kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kformula/Makefile" ;;
--  "doc/kivio/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kivio/Makefile" ;;
--  "doc/koffice/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/koffice/Makefile" ;;
--  "doc/koshell/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/koshell/Makefile" ;;
--  "doc/kplato/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kplato/Makefile" ;;
--  "doc/kpresenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpresenter/Makefile" ;;
--  "doc/krita/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/krita/Makefile" ;;
--  "doc/kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kspread/Makefile" ;;
--  "doc/kugar/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kugar/Makefile" ;;
--  "doc/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kword/Makefile" ;;
--  "doc/thesaurus/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/thesaurus/Makefile" ;;
--  "example/Makefile" ) CONFIG_FILES="$CONFIG_FILES example/Makefile" ;;
--  "filters/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/Makefile" ;;
--  "filters/generic_wrapper/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/generic_wrapper/Makefile" ;;
--  "filters/karbon/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/Makefile" ;;
--  "filters/karbon/ai/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/ai/Makefile" ;;
--  "filters/karbon/applixgraphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/applixgraphics/Makefile" ;;
--  "filters/karbon/eps/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/eps/Makefile" ;;
--  "filters/karbon/kontour/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/kontour/Makefile" ;;
--  "filters/karbon/msod/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/msod/Makefile" ;;
--  "filters/karbon/oodraw/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/oodraw/Makefile" ;;
--  "filters/karbon/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/png/Makefile" ;;
--  "filters/karbon/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/svg/Makefile" ;;
--  "filters/karbon/wmf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/wmf/Makefile" ;;
--  "filters/karbon/xaml/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/xaml/Makefile" ;;
--  "filters/karbon/xcf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/karbon/xcf/Makefile" ;;
--  "filters/kchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/Makefile" ;;
--  "filters/kchart/bmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/bmp/Makefile" ;;
--  "filters/kchart/jpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/jpeg/Makefile" ;;
--  "filters/kchart/libimageexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/libimageexport/Makefile" ;;
--  "filters/kchart/mng/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/mng/Makefile" ;;
--  "filters/kchart/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/png/Makefile" ;;
--  "filters/kchart/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/svg/Makefile" ;;
--  "filters/kchart/xbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/xbm/Makefile" ;;
--  "filters/kchart/xpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kchart/xpm/Makefile" ;;
--  "filters/kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/Makefile" ;;
--  "filters/kformula/latex/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/latex/Makefile" ;;
--  "filters/kformula/mathml/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/mathml/Makefile" ;;
--  "filters/kformula/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/png/Makefile" ;;
--  "filters/kformula/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kformula/svg/Makefile" ;;
--  "filters/kivio/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kivio/Makefile" ;;
--  "filters/kivio/imageexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kivio/imageexport/Makefile" ;;
--  "filters/kpresenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/Makefile" ;;
--  "filters/kpresenter/bmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/bmp/Makefile" ;;
--  "filters/kpresenter/jpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/jpeg/Makefile" ;;
--  "filters/kpresenter/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/kword/Makefile" ;;
--  "filters/kpresenter/libimageexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/libimageexport/Makefile" ;;
--  "filters/kpresenter/magicpoint/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/magicpoint/Makefile" ;;
--  "filters/kpresenter/mng/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/mng/Makefile" ;;
--  "filters/kpresenter/ooimpress/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/ooimpress/Makefile" ;;
--  "filters/kpresenter/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/png/Makefile" ;;
--  "filters/kpresenter/powerpoint/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/Makefile" ;;
--  "filters/kpresenter/powerpoint/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/import/Makefile" ;;
--  "filters/kpresenter/powerpoint/libppt/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/libppt/Makefile" ;;
--  "filters/kpresenter/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/svg/Makefile" ;;
--  "filters/kpresenter/xbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xbm/Makefile" ;;
--  "filters/kpresenter/xpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xpm/Makefile" ;;
--  "filters/krita/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/Makefile" ;;
--  "filters/krita/jpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/jpeg/Makefile" ;;
--  "filters/krita/libkisexif/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/libkisexif/Makefile" ;;
--  "filters/krita/magick/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/magick/Makefile" ;;
--  "filters/krita/openexr/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/openexr/Makefile" ;;
--  "filters/krita/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/png/Makefile" ;;
--  "filters/krita/raw/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/raw/Makefile" ;;
--  "filters/krita/tiff/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/tiff/Makefile" ;;
--  "filters/krita/xcf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/krita/xcf/Makefile" ;;
--  "filters/kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/Makefile" ;;
--  "filters/kspread/applixspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/applixspread/Makefile" ;;
--  "filters/kspread/csv/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/csv/Makefile" ;;
--  "filters/kspread/dbase/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/dbase/Makefile" ;;
--  "filters/kspread/excel/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/Makefile" ;;
--  "filters/kspread/excel/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/import/Makefile" ;;
--  "filters/kspread/excel/sidewinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/sidewinder/Makefile" ;;
--  "filters/kspread/gnumeric/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/gnumeric/Makefile" ;;
--  "filters/kspread/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/html/Makefile" ;;
--  "filters/kspread/latex/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/Makefile" ;;
--  "filters/kspread/latex/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/export/Makefile" ;;
--  "filters/kspread/libkspreadexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/libkspreadexport/Makefile" ;;
--  "filters/kspread/opencalc/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/opencalc/Makefile" ;;
--  "filters/kspread/qpro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/Makefile" ;;
--  "filters/kspread/qpro/libqpro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/Makefile" ;;
--  "filters/kspread/qpro/libqpro/qpro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/qpro/Makefile" ;;
--  "filters/kspread/qpro/libqpro/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/src/Makefile" ;;
--  "filters/kugar/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kugar/Makefile" ;;
--  "filters/kugar/kugarnop/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kugar/kugarnop/Makefile" ;;
--  "filters/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/Makefile" ;;
--  "filters/kword/abiword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/abiword/Makefile" ;;
--  "filters/kword/amipro/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/amipro/Makefile" ;;
--  "filters/kword/applixword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/applixword/Makefile" ;;
--  "filters/kword/ascii/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/ascii/Makefile" ;;
--  "filters/kword/docbook/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/docbook/Makefile" ;;
--  "filters/kword/hancomword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/hancomword/Makefile" ;;
--  "filters/kword/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/html/Makefile" ;;
--  "filters/kword/html/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/html/export/Makefile" ;;
--  "filters/kword/html/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/html/import/Makefile" ;;
--  "filters/kword/kword1.3/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/Makefile" ;;
--  "filters/kword/kword1.3/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/import/Makefile" ;;
--  "filters/kword/latex/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/Makefile" ;;
--  "filters/kword/latex/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/export/Makefile" ;;
--  "filters/kword/latex/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/Makefile" ;;
--  "filters/kword/latex/import/generator/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/generator/Makefile" ;;
--  "filters/kword/latex/import/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/parser/Makefile" ;;
--  "filters/kword/libexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/libexport/Makefile" ;;
--  "filters/kword/msword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/msword/Makefile" ;;
--  "filters/kword/mswrite/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/mswrite/Makefile" ;;
--  "filters/kword/oowriter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/oowriter/Makefile" ;;
--  "filters/kword/palmdoc/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/palmdoc/Makefile" ;;
--  "filters/kword/pdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/Makefile" ;;
--  "filters/kword/pdf/xpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/Makefile" ;;
--  "filters/kword/pdf/xpdf/goo/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/goo/Makefile" ;;
--  "filters/kword/pdf/xpdf/xpdf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/xpdf/Makefile" ;;
--  "filters/kword/rtf/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/Makefile" ;;
--  "filters/kword/rtf/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/export/Makefile" ;;
--  "filters/kword/rtf/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/import/Makefile" ;;
--  "filters/kword/starwriter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/starwriter/Makefile" ;;
--  "filters/kword/wml/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wml/Makefile" ;;
--  "filters/kword/wordperfect/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/Makefile" ;;
--  "filters/kword/wordperfect/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/export/Makefile" ;;
--  "filters/kword/wordperfect/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/import/Makefile" ;;
--  "filters/libdialogfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/libdialogfilter/Makefile" ;;
--  "filters/liboofilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/liboofilter/Makefile" ;;
--  "filters/xsltfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/Makefile" ;;
--  "filters/xsltfilter/export/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/Makefile" ;;
--  "filters/xsltfilter/export/xsl/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/Makefile" ;;
--  "filters/xsltfilter/export/xsl/kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/Makefile" ;;
--  "filters/xsltfilter/export/xsl/kword/xslfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/xslfo/Makefile" ;;
--  "filters/xsltfilter/import/Makefile" ) CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/import/Makefile" ;;
--  "interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES interfaces/Makefile" ;;
--  "karbon/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/Makefile" ;;
--  "karbon/commands/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/commands/Makefile" ;;
--  "karbon/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/core/Makefile" ;;
--  "karbon/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/data/Makefile" ;;
--  "karbon/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/dialogs/Makefile" ;;
--  "karbon/dockers/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/dockers/Makefile" ;;
--  "karbon/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/pics/Makefile" ;;
--  "karbon/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/Makefile" ;;
--  "karbon/plugins/flattenpath/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/flattenpath/Makefile" ;;
--  "karbon/plugins/imagetool/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/imagetool/Makefile" ;;
--  "karbon/plugins/insertknots/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/insertknots/Makefile" ;;
--  "karbon/plugins/roundcorners/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/roundcorners/Makefile" ;;
--  "karbon/plugins/shadoweffect/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/shadoweffect/Makefile" ;;
--  "karbon/plugins/whirlpinch/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/whirlpinch/Makefile" ;;
--  "karbon/plugins/zoomtool/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/plugins/zoomtool/Makefile" ;;
--  "karbon/render/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/render/Makefile" ;;
--  "karbon/render/xrgbrender/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/render/xrgbrender/Makefile" ;;
--  "karbon/shapes/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/shapes/Makefile" ;;
--  "karbon/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/templates/Makefile" ;;
--  "karbon/templates/basic/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/templates/basic/Makefile" ;;
--  "karbon/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/tools/Makefile" ;;
--  "karbon/visitors/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/visitors/Makefile" ;;
--  "karbon/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES karbon/widgets/Makefile" ;;
--  "kchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/Makefile" ;;
--  "kchart/kdchart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/kdchart/Makefile" ;;
--  "kchart/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/pics/Makefile" ;;
--  "kchart/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/templates/Makefile" ;;
--  "kchart/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/toolbar/Makefile" ;;
--  "kchart/toolbar/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/toolbar/crystalsvg/Makefile" ;;
--  "kchart/toolbar/locolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kchart/toolbar/locolor/Makefile" ;;
--  "kdgantt/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdgantt/Makefile" ;;
--  "kexi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/Makefile" ;;
--  "kexi/3rdparty/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/Makefile" ;;
--  "kexi/3rdparty/kexisql/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/Makefile" ;;
--  "kexi/3rdparty/kexisql/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/src/Makefile" ;;
--  "kexi/3rdparty/kexisql/tool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/tool/Makefile" ;;
--  "kexi/3rdparty/kexisql3/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/Makefile" ;;
--  "kexi/3rdparty/kexisql3/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/src/Makefile" ;;
--  "kexi/3rdparty/kolibs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kolibs/Makefile" ;;
--  "kexi/3rdparty/uuid/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/uuid/Makefile" ;;
--  "kexi/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/core/Makefile" ;;
--  "kexi/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/data/Makefile" ;;
--  "kexi/data/kde34compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/data/kde34compat/Makefile" ;;
--  "kexi/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/examples/Makefile" ;;
--  "kexi/formeditor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/Makefile" ;;
--  "kexi/formeditor/factories/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/factories/Makefile" ;;
--  "kexi/formeditor/kdevelop_plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/kdevelop_plugin/Makefile" ;;
--  "kexi/formeditor/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/scripting/Makefile" ;;
--  "kexi/formeditor/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/formeditor/test/Makefile" ;;
--  "kexi/kexidb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/Makefile" ;;
--  "kexi/kexidb/drivers/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/Makefile" ;;
--  "kexi/kexidb/drivers/mySQL/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/mySQL/Makefile" ;;
--  "kexi/kexidb/drivers/odbc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/odbc/Makefile" ;;
--  "kexi/kexidb/drivers/pqxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/pqxx/Makefile" ;;
--  "kexi/kexidb/drivers/sqlite/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite/Makefile" ;;
--  "kexi/kexidb/drivers/sqlite2/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite2/Makefile" ;;
--  "kexi/kexidb/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexidb/parser/Makefile" ;;
--  "kexi/kexiutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/kexiutils/Makefile" ;;
--  "kexi/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/main/Makefile" ;;
--  "kexi/main/printing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/main/printing/Makefile" ;;
--  "kexi/main/startup/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/main/startup/Makefile" ;;
--  "kexi/migration/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/Makefile" ;;
--  "kexi/migration/mysql/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/mysql/Makefile" ;;
--  "kexi/migration/pqxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/pqxx/Makefile" ;;
--  "kexi/migration/txt/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/migration/txt/Makefile" ;;
--  "kexi/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/pics/Makefile" ;;
--  "kexi/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/Makefile" ;;
--  "kexi/plugins/forms/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/Makefile" ;;
--  "kexi/plugins/forms/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/widgets/Makefile" ;;
--  "kexi/plugins/importexport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/Makefile" ;;
--  "kexi/plugins/importexport/csv/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/csv/Makefile" ;;
--  "kexi/plugins/migration/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/migration/Makefile" ;;
--  "kexi/plugins/queries/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/queries/Makefile" ;;
--  "kexi/plugins/relations/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/relations/Makefile" ;;
--  "kexi/plugins/reports/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/reports/Makefile" ;;
--  "kexi/plugins/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/Makefile" ;;
--  "kexi/plugins/scripting/kexiapp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiapp/Makefile" ;;
--  "kexi/plugins/scripting/kexidb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexidb/Makefile" ;;
--  "kexi/plugins/scripting/kexiscripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiscripting/Makefile" ;;
--  "kexi/plugins/scripting/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/Makefile" ;;
--  "kexi/plugins/scripting/scripts/copycenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/copycenter/Makefile" ;;
--  "kexi/plugins/scripting/scripts/exportxhtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/exportxhtml/Makefile" ;;
--  "kexi/plugins/scripting/scripts/importxhtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/importxhtml/Makefile" ;;
--  "kexi/plugins/scripting/scripts/projectdocumentor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/projectdocumentor/Makefile" ;;
--  "kexi/plugins/scripting/scripts/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/Makefile" ;;
--  "kexi/plugins/scripting/scripts/python/kexiapp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/kexiapp/Makefile" ;;
--  "kexi/plugins/tables/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/plugins/tables/Makefile" ;;
--  "kexi/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/Makefile" ;;
--  "kexi/tests/newapi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/newapi/Makefile" ;;
--  "kexi/tests/parser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/parser/Makefile" ;;
--  "kexi/tests/startup/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/startup/Makefile" ;;
--  "kexi/tests/tableview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/tableview/Makefile" ;;
--  "kexi/tests/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/tests/widgets/Makefile" ;;
--  "kexi/widget/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/Makefile" ;;
--  "kexi/widget/relations/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/relations/Makefile" ;;
--  "kexi/widget/tableview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/tableview/Makefile" ;;
--  "kexi/widget/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kexi/widget/utils/Makefile" ;;
--  "kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES kformula/Makefile" ;;
--  "kformula/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kformula/pics/Makefile" ;;
--  "kivio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/Makefile" ;;
--  "kivio/kiviopart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/Makefile" ;;
--  "kivio/kiviopart/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/config/Makefile" ;;
--  "kivio/kiviopart/kiviosdk/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/kiviosdk/Makefile" ;;
--  "kivio/kiviopart/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/pics/Makefile" ;;
--  "kivio/kiviopart/stencils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Assorted/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Assorted/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Circuit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Circuit/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Cisco/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Cisco/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Civil/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Civil/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Contact/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Contact/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Electric/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Electric/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Jigsaw/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Jigsaw/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/MSE/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/MSE/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Network/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Network/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Pneumatic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Pneumatic/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/SDL/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/SDL/Makefile" ;;
--  "kivio/kiviopart/stencils/Dia/Sybase/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Sybase/Makefile" ;;
--  "kivio/kiviopart/stencils/Flowcharting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Makefile" ;;
--  "kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile" ;;
--  "kivio/kiviopart/stencils/Flowcharting/Extended/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Extended/Makefile" ;;
--  "kivio/kiviopart/stencils/Flowcharting/Logic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Logic/Makefile" ;;
--  "kivio/kiviopart/stencils/Geographic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Makefile" ;;
--  "kivio/kiviopart/stencils/Geographic/Flags/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Flags/Makefile" ;;
--  "kivio/kiviopart/stencils/Geographic/Maps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Maps/Makefile" ;;
--  "kivio/kiviopart/stencils/Hardware/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Makefile" ;;
--  "kivio/kiviopart/stencils/Hardware/Computer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Computer/Makefile" ;;
--  "kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile" ;;
--  "kivio/kiviopart/stencils/Miscellaneous/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Makefile" ;;
--  "kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile" ;;
--  "kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile" ;;
--  "kivio/kiviopart/stencils/Miscellaneous/ER/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/ER/Makefile" ;;
--  "kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile" ;;
--  "kivio/kiviopart/stencils/Miscellaneous/People/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/People/Makefile" ;;
--  "kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile" ;;
--  "kivio/kiviopart/stencils/UML/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/Makefile" ;;
--  "kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile" ;;
--  "kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile" ;;
--  "kivio/kiviopart/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tiles/Makefile" ;;
--  "kivio/kiviopart/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tools/Makefile" ;;
--  "kivio/kiviopart/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/ui/Makefile" ;;
--  "kivio/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/Makefile" ;;
--  "kivio/plugins/kivioconnectortool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/Makefile" ;;
--  "kivio/plugins/kivioconnectortool/straight_connector/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/straight_connector/Makefile" ;;
--  "kivio/plugins/kivioselecttool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/Makefile" ;;
--  "kivio/plugins/kivioselecttool/select_pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/select_pics/Makefile" ;;
--  "kivio/plugins/kiviosmlconnector/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/Makefile" ;;
--  "kivio/plugins/kiviosmlconnector/sml_connector/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/sml_connector/Makefile" ;;
--  "kivio/plugins/kiviotargettool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotargettool/Makefile" ;;
--  "kivio/plugins/kiviotexttool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotexttool/Makefile" ;;
--  "kivio/plugins/kiviozoomtool/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/Makefile" ;;
--  "kivio/plugins/kiviozoomtool/zoom_pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/zoom_pics/Makefile" ;;
--  "kivio/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/templates/Makefile" ;;
--  "kivio/templates/basic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kivio/templates/basic/Makefile" ;;
--  "koshell/Makefile" ) CONFIG_FILES="$CONFIG_FILES koshell/Makefile" ;;
--  "kounavail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kounavail/Makefile" ;;
--  "kplato/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/Makefile" ;;
--  "kplato/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/pics/Makefile" ;;
--  "kplato/reports/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/reports/Makefile" ;;
--  "kplato/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/templates/Makefile" ;;
--  "kplato/templates/Simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/templates/Simple/Makefile" ;;
--  "kplato/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/tests/Makefile" ;;
--  "kplato/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kplato/toolbar/Makefile" ;;
--  "kpresenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/Makefile" ;;
--  "kpresenter/autoformEdit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoformEdit/Makefile" ;;
--  "kpresenter/autoforms/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Makefile" ;;
--  "kpresenter/autoforms/Arrows/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Arrows/Makefile" ;;
--  "kpresenter/autoforms/Connections/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Connections/Makefile" ;;
--  "kpresenter/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/dtd/Makefile" ;;
--  "kpresenter/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/pics/Makefile" ;;
--  "kpresenter/pics/rotate/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/pics/rotate/Makefile" ;;
--  "kpresenter/slideshow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/slideshow/Makefile" ;;
--  "kpresenter/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Makefile" ;;
--  "kpresenter/templates/A4/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/A4/Makefile" ;;
--  "kpresenter/templates/Screen/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screen/Makefile" ;;
--  "kpresenter/templates/Screenpresentations/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screenpresentations/Makefile" ;;
--  "kpresenter/templates/common_icon/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/common_icon/Makefile" ;;
--  "kpresenter/templates/legal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/legal/Makefile" ;;
--  "kpresenter/templates/letter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/templates/letter/Makefile" ;;
--  "kpresenter/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpresenter/toolbar/Makefile" ;;
--  "krita/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/Makefile" ;;
--  "krita/colorspaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/Makefile" ;;
--  "krita/colorspaces/cmyk_u16/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u16/Makefile" ;;
--  "krita/colorspaces/cmyk_u8/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/Makefile" ;;
--  "krita/colorspaces/cmyk_u8/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/templates/Makefile" ;;
--  "krita/colorspaces/gray_u16/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u16/Makefile" ;;
--  "krita/colorspaces/gray_u8/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/Makefile" ;;
--  "krita/colorspaces/gray_u8/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/templates/Makefile" ;;
--  "krita/colorspaces/gray_u8/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/tests/Makefile" ;;
--  "krita/colorspaces/lms_f32/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/lms_f32/Makefile" ;;
--  "krita/colorspaces/rgb_f16half/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/Makefile" ;;
--  "krita/colorspaces/rgb_f16half/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/tests/Makefile" ;;
--  "krita/colorspaces/rgb_f32/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/Makefile" ;;
--  "krita/colorspaces/rgb_f32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/tests/Makefile" ;;
--  "krita/colorspaces/rgb_u16/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/Makefile" ;;
--  "krita/colorspaces/rgb_u16/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/tests/Makefile" ;;
--  "krita/colorspaces/rgb_u8/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/Makefile" ;;
--  "krita/colorspaces/rgb_u8/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/templates/Makefile" ;;
--  "krita/colorspaces/rgb_u8/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/tests/Makefile" ;;
--  "krita/colorspaces/wet/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wet/Makefile" ;;
--  "krita/colorspaces/wetsticky/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/Makefile" ;;
--  "krita/colorspaces/wetsticky/brushop/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/brushop/Makefile" ;;
--  "krita/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/Makefile" ;;
--  "krita/core/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/tests/Makefile" ;;
--  "krita/core/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/tiles/Makefile" ;;
--  "krita/core/tiles/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/core/tiles/tests/Makefile" ;;
--  "krita/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/Makefile" ;;
--  "krita/data/brushes/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/brushes/Makefile" ;;
--  "krita/data/gradients/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/gradients/Makefile" ;;
--  "krita/data/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/images/Makefile" ;;
--  "krita/data/palettes/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/palettes/Makefile" ;;
--  "krita/data/patterns/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/patterns/Makefile" ;;
--  "krita/data/profiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/data/profiles/Makefile" ;;
--  "krita/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/dtd/Makefile" ;;
--  "krita/kritacolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/kritacolor/Makefile" ;;
--  "krita/kritacolor/colorspaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/kritacolor/colorspaces/Makefile" ;;
--  "krita/kritacolor/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/kritacolor/tests/Makefile" ;;
--  "krita/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/pics/Makefile" ;;
--  "krita/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/Makefile" ;;
--  "krita/plugins/filters/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/Makefile" ;;
--  "krita/plugins/filters/bumpmap/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/bumpmap/Makefile" ;;
--  "krita/plugins/filters/cimg/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cimg/Makefile" ;;
--  "krita/plugins/filters/colorsfilters/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/colorsfilters/Makefile" ;;
--  "krita/plugins/filters/convolutionfilters/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/convolutionfilters/Makefile" ;;
--  "krita/plugins/filters/cubismfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cubismfilter/Makefile" ;;
--  "krita/plugins/filters/embossfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/embossfilter/Makefile" ;;
--  "krita/plugins/filters/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/example/Makefile" ;;
--  "krita/plugins/filters/imageenhancement/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/imageenhancement/Makefile" ;;
--  "krita/plugins/filters/oilpaintfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/oilpaintfilter/Makefile" ;;
--  "krita/plugins/filters/pixelizefilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/pixelizefilter/Makefile" ;;
--  "krita/plugins/filters/raindropsfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/raindropsfilter/Makefile" ;;
--  "krita/plugins/filters/roundcorners/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/roundcorners/Makefile" ;;
--  "krita/plugins/filters/smalltilesfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/smalltilesfilter/Makefile" ;;
--  "krita/plugins/filters/sobelfilter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/sobelfilter/Makefile" ;;
--  "krita/plugins/filters/threadtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/threadtest/Makefile" ;;
--  "krita/plugins/paintops/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/Makefile" ;;
--  "krita/plugins/paintops/defaultpaintops/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/defaultpaintops/Makefile" ;;
--  "krita/plugins/paintops/smearybrush/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/smearybrush/Makefile" ;;
--  "krita/plugins/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/Makefile" ;;
--  "krita/plugins/tools/defaulttools/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/defaulttools/Makefile" ;;
--  "krita/plugins/tools/selectiontools/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/selectiontools/Makefile" ;;
--  "krita/plugins/tools/tool_crop/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_crop/Makefile" ;;
--  "krita/plugins/tools/tool_filter/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_filter/Makefile" ;;
--  "krita/plugins/tools/tool_polygon/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polygon/Makefile" ;;
--  "krita/plugins/tools/tool_polyline/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polyline/Makefile" ;;
--  "krita/plugins/tools/tool_selectsimilar/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_selectsimilar/Makefile" ;;
--  "krita/plugins/tools/tool_star/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_star/Makefile" ;;
--  "krita/plugins/tools/tool_transform/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_transform/Makefile" ;;
--  "krita/plugins/viewplugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/Makefile" ;;
--  "krita/plugins/viewplugins/colorrange/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorrange/Makefile" ;;
--  "krita/plugins/viewplugins/colorspaceconversion/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorspaceconversion/Makefile" ;;
--  "krita/plugins/viewplugins/dropshadow/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/dropshadow/Makefile" ;;
--  "krita/plugins/viewplugins/filtersgallery/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/filtersgallery/Makefile" ;;
--  "krita/plugins/viewplugins/histogram/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram/Makefile" ;;
--  "krita/plugins/viewplugins/histogram_docker/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram_docker/Makefile" ;;
--  "krita/plugins/viewplugins/history_docker/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/history_docker/Makefile" ;;
--  "krita/plugins/viewplugins/imagesize/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/imagesize/Makefile" ;;
--  "krita/plugins/viewplugins/performancetest/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/performancetest/Makefile" ;;
--  "krita/plugins/viewplugins/rotateimage/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/rotateimage/Makefile" ;;
--  "krita/plugins/viewplugins/screenshot/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/screenshot/Makefile" ;;
--  "krita/plugins/viewplugins/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/Makefile" ;;
--  "krita/plugins/viewplugins/scripting/kritacore/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritacore/Makefile" ;;
--  "krita/plugins/viewplugins/scripting/kritascripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritascripting/Makefile" ;;
--  "krita/plugins/viewplugins/scripting/samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/Makefile" ;;
--  "krita/plugins/viewplugins/scripting/samples/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/python/Makefile" ;;
--  "krita/plugins/viewplugins/scripting/samples/ruby/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/ruby/Makefile" ;;
--  "krita/plugins/viewplugins/separate_channels/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/separate_channels/Makefile" ;;
--  "krita/plugins/viewplugins/shearimage/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/shearimage/Makefile" ;;
--  "krita/plugins/viewplugins/variations/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/variations/Makefile" ;;
--  "krita/sdk/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/sdk/Makefile" ;;
--  "krita/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES krita/ui/Makefile" ;;
--  "kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/Makefile" ;;
--  "kspread/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/dialogs/Makefile" ;;
--  "kspread/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/dtd/Makefile" ;;
--  "kspread/extensions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/extensions/Makefile" ;;
--  "kspread/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/pics/Makefile" ;;
--  "kspread/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/Makefile" ;;
--  "kspread/plugins/calculator/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/Makefile" ;;
--  "kspread/plugins/calculator/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/pics/Makefile" ;;
--  "kspread/plugins/insertcalendar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/plugins/insertcalendar/Makefile" ;;
--  "kspread/sheetstyles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/sheetstyles/Makefile" ;;
--  "kspread/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/Makefile" ;;
--  "kspread/templates/Business/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/Business/Makefile" ;;
--  "kspread/templates/General/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/General/Makefile" ;;
--  "kspread/templates/HomeFamily/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/templates/HomeFamily/Makefile" ;;
--  "kspread/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/tests/Makefile" ;;
--  "kspread/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/toolbar/Makefile" ;;
--  "kspread/toolbar/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES kspread/toolbar/crystalsvg/Makefile" ;;
--  "kugar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/Makefile" ;;
--  "kugar/kudesigner/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/Makefile" ;;
--  "kugar/kudesigner/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/pics/Makefile" ;;
--  "kugar/kudesigner/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/Makefile" ;;
--  "kugar/kudesigner/templates/General/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/General/Makefile" ;;
--  "kugar/kudesigner/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/toolbar/Makefile" ;;
--  "kugar/kudesigner_lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/kudesigner_lib/Makefile" ;;
--  "kugar/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/lib/Makefile" ;;
--  "kugar/part/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/part/Makefile" ;;
--  "kugar/samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES kugar/samples/Makefile" ;;
--  "kword/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/Makefile" ;;
--  "kword/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/data/Makefile" ;;
--  "kword/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/dtd/Makefile" ;;
--  "kword/expression/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/expression/Makefile" ;;
--  "kword/horizontalline/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/horizontalline/Makefile" ;;
--  "kword/mailmerge/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/Makefile" ;;
--  "kword/mailmerge/kabc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kabc/Makefile" ;;
--  "kword/mailmerge/kspread/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kspread/Makefile" ;;
--  "kword/mailmerge/sql/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/mailmerge/sql/Makefile" ;;
--  "kword/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/pics/Makefile" ;;
--  "kword/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/Makefile" ;;
--  "kword/templates/CardsAndLabels/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/CardsAndLabels/Makefile" ;;
--  "kword/templates/Envelopes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/Envelopes/Makefile" ;;
--  "kword/templates/Wordprocessing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/templates/Wordprocessing/Makefile" ;;
--  "kword/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/tests/Makefile" ;;
--  "kword/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kword/toolbar/Makefile" ;;
--  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
--  "lib/kformula/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/Makefile" ;;
--  "lib/kformula/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/config/Makefile" ;;
--  "lib/kformula/dtd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/dtd/Makefile" ;;
--  "lib/kformula/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/fonts/Makefile" ;;
--  "lib/kformula/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/Makefile" ;;
--  "lib/kformula/pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/crystalsvg/Makefile" ;;
--  "lib/kofficecore/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficecore/Makefile" ;;
--  "lib/kofficecore/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficecore/tests/Makefile" ;;
--  "lib/kofficeui/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficeui/Makefile" ;;
--  "lib/kofficeui/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficeui/pics/Makefile" ;;
--  "lib/kofficeui/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kofficeui/tests/Makefile" ;;
--  "lib/kopainter/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kopainter/Makefile" ;;
--  "lib/kopalette/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kopalette/Makefile" ;;
--  "lib/koproperty/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/koproperty/Makefile" ;;
--  "lib/koproperty/editors/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/koproperty/editors/Makefile" ;;
--  "lib/koproperty/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/koproperty/test/Makefile" ;;
--  "lib/kotext/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/Makefile" ;;
--  "lib/kotext/kohyphen/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/Makefile" ;;
--  "lib/kotext/kohyphen/hyphdicts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/hyphdicts/Makefile" ;;
--  "lib/kotext/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kotext/tests/Makefile" ;;
--  "lib/kross/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/Makefile" ;;
--  "lib/kross/api/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/api/Makefile" ;;
--  "lib/kross/main/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/main/Makefile" ;;
--  "lib/kross/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/Makefile" ;;
--  "lib/kross/python/CXX/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/CXX/Makefile" ;;
--  "lib/kross/python/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/Makefile" ;;
--  "lib/kross/python/scripts/RestrictedPython/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/RestrictedPython/Makefile" ;;
--  "lib/kross/ruby/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/ruby/Makefile" ;;
--  "lib/kross/runner/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/runner/Makefile" ;;
--  "lib/kross/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kross/test/Makefile" ;;
--  "lib/kwmf/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kwmf/Makefile" ;;
--  "lib/store/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/store/Makefile" ;;
--  "lib/store/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/store/tests/Makefile" ;;
--  "mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES mimetypes/Makefile" ;;
--  "mimetypes/kde33/Makefile" ) CONFIG_FILES="$CONFIG_FILES mimetypes/kde33/Makefile" ;;
--  "mimetypes/kde351/Makefile" ) CONFIG_FILES="$CONFIG_FILES mimetypes/kde351/Makefile" ;;
--  "pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;;
--  "pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;;
--  "plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
--  "plugins/scan/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugins/scan/Makefile" ;;
--  "servicetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES servicetypes/Makefile" ;;
--  "templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES templates/Makefile" ;;
--  "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
--  "tools/converter/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/converter/Makefile" ;;
--  "tools/kfile-plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/Makefile" ;;
--  "tools/kfile-plugins/abiword/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/abiword/Makefile" ;;
--  "tools/kfile-plugins/gnumeric/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/gnumeric/Makefile" ;;
--  "tools/kfile-plugins/koffice/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/koffice/Makefile" ;;
--  "tools/kfile-plugins/ooo/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/ooo/Makefile" ;;
--  "tools/kthesaurus/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/kthesaurus/Makefile" ;;
--  "tools/quickprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/quickprint/Makefile" ;;
--  "tools/spell/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/spell/Makefile" ;;
--  "tools/thesaurus/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/thesaurus/Makefile" ;;
--  "tools/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/thumbnail/Makefile" ;;
--  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+  case $ac_config_target in
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "autocorrect/Makefile") CONFIG_FILES="$CONFIG_FILES autocorrect/Makefile" ;;
-+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+    "doc/karbon/Makefile") CONFIG_FILES="$CONFIG_FILES doc/karbon/Makefile" ;;
-+    "doc/kchart/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kchart/Makefile" ;;
-+    "doc/kexi/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kexi/Makefile" ;;
-+    "doc/kformula/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kformula/Makefile" ;;
-+    "doc/kivio/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kivio/Makefile" ;;
-+    "doc/koffice/Makefile") CONFIG_FILES="$CONFIG_FILES doc/koffice/Makefile" ;;
-+    "doc/koshell/Makefile") CONFIG_FILES="$CONFIG_FILES doc/koshell/Makefile" ;;
-+    "doc/kplato/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kplato/Makefile" ;;
-+    "doc/kpresenter/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kpresenter/Makefile" ;;
-+    "doc/krita/Makefile") CONFIG_FILES="$CONFIG_FILES doc/krita/Makefile" ;;
-+    "doc/kspread/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kspread/Makefile" ;;
-+    "doc/kugar/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kugar/Makefile" ;;
-+    "doc/kword/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kword/Makefile" ;;
-+    "doc/thesaurus/Makefile") CONFIG_FILES="$CONFIG_FILES doc/thesaurus/Makefile" ;;
-+    "example/Makefile") CONFIG_FILES="$CONFIG_FILES example/Makefile" ;;
-+    "filters/Makefile") CONFIG_FILES="$CONFIG_FILES filters/Makefile" ;;
-+    "filters/generic_wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES filters/generic_wrapper/Makefile" ;;
-+    "filters/karbon/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/Makefile" ;;
-+    "filters/karbon/ai/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/ai/Makefile" ;;
-+    "filters/karbon/applixgraphics/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/applixgraphics/Makefile" ;;
-+    "filters/karbon/eps/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/eps/Makefile" ;;
-+    "filters/karbon/kontour/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/kontour/Makefile" ;;
-+    "filters/karbon/msod/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/msod/Makefile" ;;
-+    "filters/karbon/oodraw/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/oodraw/Makefile" ;;
-+    "filters/karbon/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/png/Makefile" ;;
-+    "filters/karbon/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/svg/Makefile" ;;
-+    "filters/karbon/wmf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/wmf/Makefile" ;;
-+    "filters/karbon/xaml/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/xaml/Makefile" ;;
-+    "filters/karbon/xcf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/karbon/xcf/Makefile" ;;
-+    "filters/kchart/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/Makefile" ;;
-+    "filters/kchart/bmp/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/bmp/Makefile" ;;
-+    "filters/kchart/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/jpeg/Makefile" ;;
-+    "filters/kchart/libimageexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/libimageexport/Makefile" ;;
-+    "filters/kchart/mng/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/mng/Makefile" ;;
-+    "filters/kchart/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/png/Makefile" ;;
-+    "filters/kchart/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/svg/Makefile" ;;
-+    "filters/kchart/xbm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/xbm/Makefile" ;;
-+    "filters/kchart/xpm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kchart/xpm/Makefile" ;;
-+    "filters/kformula/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/Makefile" ;;
-+    "filters/kformula/latex/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/latex/Makefile" ;;
-+    "filters/kformula/mathml/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/mathml/Makefile" ;;
-+    "filters/kformula/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/png/Makefile" ;;
-+    "filters/kformula/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kformula/svg/Makefile" ;;
-+    "filters/kivio/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kivio/Makefile" ;;
-+    "filters/kivio/imageexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kivio/imageexport/Makefile" ;;
-+    "filters/kpresenter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/Makefile" ;;
-+    "filters/kpresenter/bmp/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/bmp/Makefile" ;;
-+    "filters/kpresenter/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/jpeg/Makefile" ;;
-+    "filters/kpresenter/kword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/kword/Makefile" ;;
-+    "filters/kpresenter/libimageexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/libimageexport/Makefile" ;;
-+    "filters/kpresenter/magicpoint/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/magicpoint/Makefile" ;;
-+    "filters/kpresenter/mng/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/mng/Makefile" ;;
-+    "filters/kpresenter/ooimpress/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/ooimpress/Makefile" ;;
-+    "filters/kpresenter/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/png/Makefile" ;;
-+    "filters/kpresenter/powerpoint/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/Makefile" ;;
-+    "filters/kpresenter/powerpoint/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/import/Makefile" ;;
-+    "filters/kpresenter/powerpoint/libppt/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/powerpoint/libppt/Makefile" ;;
-+    "filters/kpresenter/svg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/svg/Makefile" ;;
-+    "filters/kpresenter/xbm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xbm/Makefile" ;;
-+    "filters/kpresenter/xpm/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kpresenter/xpm/Makefile" ;;
-+    "filters/krita/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/Makefile" ;;
-+    "filters/krita/jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/jpeg/Makefile" ;;
-+    "filters/krita/libkisexif/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/libkisexif/Makefile" ;;
-+    "filters/krita/magick/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/magick/Makefile" ;;
-+    "filters/krita/openexr/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/openexr/Makefile" ;;
-+    "filters/krita/png/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/png/Makefile" ;;
-+    "filters/krita/raw/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/raw/Makefile" ;;
-+    "filters/krita/tiff/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/tiff/Makefile" ;;
-+    "filters/krita/xcf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/krita/xcf/Makefile" ;;
-+    "filters/kspread/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/Makefile" ;;
-+    "filters/kspread/applixspread/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/applixspread/Makefile" ;;
-+    "filters/kspread/csv/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/csv/Makefile" ;;
-+    "filters/kspread/dbase/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/dbase/Makefile" ;;
-+    "filters/kspread/excel/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/Makefile" ;;
-+    "filters/kspread/excel/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/import/Makefile" ;;
-+    "filters/kspread/excel/sidewinder/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/excel/sidewinder/Makefile" ;;
-+    "filters/kspread/gnumeric/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/gnumeric/Makefile" ;;
-+    "filters/kspread/html/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/html/Makefile" ;;
-+    "filters/kspread/latex/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/Makefile" ;;
-+    "filters/kspread/latex/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/latex/export/Makefile" ;;
-+    "filters/kspread/libkspreadexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/libkspreadexport/Makefile" ;;
-+    "filters/kspread/opencalc/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/opencalc/Makefile" ;;
-+    "filters/kspread/qpro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/Makefile" ;;
-+    "filters/kspread/qpro/libqpro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/Makefile" ;;
-+    "filters/kspread/qpro/libqpro/qpro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/qpro/Makefile" ;;
-+    "filters/kspread/qpro/libqpro/src/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kspread/qpro/libqpro/src/Makefile" ;;
-+    "filters/kugar/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kugar/Makefile" ;;
-+    "filters/kugar/kugarnop/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kugar/kugarnop/Makefile" ;;
-+    "filters/kword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/Makefile" ;;
-+    "filters/kword/abiword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/abiword/Makefile" ;;
-+    "filters/kword/amipro/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/amipro/Makefile" ;;
-+    "filters/kword/applixword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/applixword/Makefile" ;;
-+    "filters/kword/ascii/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/ascii/Makefile" ;;
-+    "filters/kword/docbook/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/docbook/Makefile" ;;
-+    "filters/kword/hancomword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/hancomword/Makefile" ;;
-+    "filters/kword/html/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/html/Makefile" ;;
-+    "filters/kword/html/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/html/export/Makefile" ;;
-+    "filters/kword/html/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/html/import/Makefile" ;;
-+    "filters/kword/kword1.3/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/Makefile" ;;
-+    "filters/kword/kword1.3/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/kword1.3/import/Makefile" ;;
-+    "filters/kword/latex/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/Makefile" ;;
-+    "filters/kword/latex/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/export/Makefile" ;;
-+    "filters/kword/latex/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/Makefile" ;;
-+    "filters/kword/latex/import/generator/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/generator/Makefile" ;;
-+    "filters/kword/latex/import/parser/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/latex/import/parser/Makefile" ;;
-+    "filters/kword/libexport/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/libexport/Makefile" ;;
-+    "filters/kword/msword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/msword/Makefile" ;;
-+    "filters/kword/mswrite/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/mswrite/Makefile" ;;
-+    "filters/kword/oowriter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/oowriter/Makefile" ;;
-+    "filters/kword/palmdoc/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/palmdoc/Makefile" ;;
-+    "filters/kword/pdf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/Makefile" ;;
-+    "filters/kword/pdf/xpdf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/Makefile" ;;
-+    "filters/kword/pdf/xpdf/goo/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/goo/Makefile" ;;
-+    "filters/kword/pdf/xpdf/xpdf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/pdf/xpdf/xpdf/Makefile" ;;
-+    "filters/kword/rtf/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/Makefile" ;;
-+    "filters/kword/rtf/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/export/Makefile" ;;
-+    "filters/kword/rtf/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/rtf/import/Makefile" ;;
-+    "filters/kword/starwriter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/starwriter/Makefile" ;;
-+    "filters/kword/wml/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wml/Makefile" ;;
-+    "filters/kword/wordperfect/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/Makefile" ;;
-+    "filters/kword/wordperfect/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/export/Makefile" ;;
-+    "filters/kword/wordperfect/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/kword/wordperfect/import/Makefile" ;;
-+    "filters/libdialogfilter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/libdialogfilter/Makefile" ;;
-+    "filters/liboofilter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/liboofilter/Makefile" ;;
-+    "filters/xsltfilter/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/Makefile" ;;
-+    "filters/xsltfilter/export/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/Makefile" ;;
-+    "filters/xsltfilter/export/xsl/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/Makefile" ;;
-+    "filters/xsltfilter/export/xsl/kword/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/Makefile" ;;
-+    "filters/xsltfilter/export/xsl/kword/xslfo/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/export/xsl/kword/xslfo/Makefile" ;;
-+    "filters/xsltfilter/import/Makefile") CONFIG_FILES="$CONFIG_FILES filters/xsltfilter/import/Makefile" ;;
-+    "interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES interfaces/Makefile" ;;
-+    "karbon/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/Makefile" ;;
-+    "karbon/commands/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/commands/Makefile" ;;
-+    "karbon/core/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/core/Makefile" ;;
-+    "karbon/data/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/data/Makefile" ;;
-+    "karbon/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/dialogs/Makefile" ;;
-+    "karbon/dockers/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/dockers/Makefile" ;;
-+    "karbon/pics/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/pics/Makefile" ;;
-+    "karbon/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/Makefile" ;;
-+    "karbon/plugins/flattenpath/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/flattenpath/Makefile" ;;
-+    "karbon/plugins/imagetool/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/imagetool/Makefile" ;;
-+    "karbon/plugins/insertknots/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/insertknots/Makefile" ;;
-+    "karbon/plugins/roundcorners/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/roundcorners/Makefile" ;;
-+    "karbon/plugins/shadoweffect/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/shadoweffect/Makefile" ;;
-+    "karbon/plugins/whirlpinch/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/whirlpinch/Makefile" ;;
-+    "karbon/plugins/zoomtool/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/plugins/zoomtool/Makefile" ;;
-+    "karbon/render/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/render/Makefile" ;;
-+    "karbon/render/xrgbrender/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/render/xrgbrender/Makefile" ;;
-+    "karbon/shapes/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/shapes/Makefile" ;;
-+    "karbon/templates/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/templates/Makefile" ;;
-+    "karbon/templates/basic/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/templates/basic/Makefile" ;;
-+    "karbon/tools/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/tools/Makefile" ;;
-+    "karbon/visitors/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/visitors/Makefile" ;;
-+    "karbon/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES karbon/widgets/Makefile" ;;
-+    "kchart/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/Makefile" ;;
-+    "kchart/kdchart/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/kdchart/Makefile" ;;
-+    "kchart/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/pics/Makefile" ;;
-+    "kchart/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/templates/Makefile" ;;
-+    "kchart/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/toolbar/Makefile" ;;
-+    "kchart/toolbar/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/toolbar/crystalsvg/Makefile" ;;
-+    "kchart/toolbar/locolor/Makefile") CONFIG_FILES="$CONFIG_FILES kchart/toolbar/locolor/Makefile" ;;
-+    "kdgantt/Makefile") CONFIG_FILES="$CONFIG_FILES kdgantt/Makefile" ;;
-+    "kexi/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/Makefile" ;;
-+    "kexi/3rdparty/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/Makefile" ;;
-+    "kexi/3rdparty/kexisql/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/Makefile" ;;
-+    "kexi/3rdparty/kexisql/src/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/src/Makefile" ;;
-+    "kexi/3rdparty/kexisql/tool/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql/tool/Makefile" ;;
-+    "kexi/3rdparty/kexisql3/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/Makefile" ;;
-+    "kexi/3rdparty/kexisql3/src/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kexisql3/src/Makefile" ;;
-+    "kexi/3rdparty/kolibs/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/kolibs/Makefile" ;;
-+    "kexi/3rdparty/uuid/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/3rdparty/uuid/Makefile" ;;
-+    "kexi/core/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/core/Makefile" ;;
-+    "kexi/data/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/data/Makefile" ;;
-+    "kexi/data/kde34compat/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/data/kde34compat/Makefile" ;;
-+    "kexi/examples/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/examples/Makefile" ;;
-+    "kexi/formeditor/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/Makefile" ;;
-+    "kexi/formeditor/factories/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/factories/Makefile" ;;
-+    "kexi/formeditor/kdevelop_plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/kdevelop_plugin/Makefile" ;;
-+    "kexi/formeditor/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/scripting/Makefile" ;;
-+    "kexi/formeditor/test/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/formeditor/test/Makefile" ;;
-+    "kexi/kexidb/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/Makefile" ;;
-+    "kexi/kexidb/drivers/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/Makefile" ;;
-+    "kexi/kexidb/drivers/mySQL/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/mySQL/Makefile" ;;
-+    "kexi/kexidb/drivers/odbc/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/odbc/Makefile" ;;
-+    "kexi/kexidb/drivers/pqxx/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/pqxx/Makefile" ;;
-+    "kexi/kexidb/drivers/sqlite/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite/Makefile" ;;
-+    "kexi/kexidb/drivers/sqlite2/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/drivers/sqlite2/Makefile" ;;
-+    "kexi/kexidb/parser/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexidb/parser/Makefile" ;;
-+    "kexi/kexiutils/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/kexiutils/Makefile" ;;
-+    "kexi/main/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/main/Makefile" ;;
-+    "kexi/main/printing/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/main/printing/Makefile" ;;
-+    "kexi/main/startup/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/main/startup/Makefile" ;;
-+    "kexi/migration/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/Makefile" ;;
-+    "kexi/migration/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/mysql/Makefile" ;;
-+    "kexi/migration/pqxx/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/pqxx/Makefile" ;;
-+    "kexi/migration/txt/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/migration/txt/Makefile" ;;
-+    "kexi/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/pics/Makefile" ;;
-+    "kexi/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/Makefile" ;;
-+    "kexi/plugins/forms/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/Makefile" ;;
-+    "kexi/plugins/forms/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/forms/widgets/Makefile" ;;
-+    "kexi/plugins/importexport/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/Makefile" ;;
-+    "kexi/plugins/importexport/csv/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/importexport/csv/Makefile" ;;
-+    "kexi/plugins/migration/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/migration/Makefile" ;;
-+    "kexi/plugins/queries/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/queries/Makefile" ;;
-+    "kexi/plugins/relations/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/relations/Makefile" ;;
-+    "kexi/plugins/reports/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/reports/Makefile" ;;
-+    "kexi/plugins/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/Makefile" ;;
-+    "kexi/plugins/scripting/kexiapp/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiapp/Makefile" ;;
-+    "kexi/plugins/scripting/kexidb/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexidb/Makefile" ;;
-+    "kexi/plugins/scripting/kexiscripting/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/kexiscripting/Makefile" ;;
-+    "kexi/plugins/scripting/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/Makefile" ;;
-+    "kexi/plugins/scripting/scripts/copycenter/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/copycenter/Makefile" ;;
-+    "kexi/plugins/scripting/scripts/exportxhtml/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/exportxhtml/Makefile" ;;
-+    "kexi/plugins/scripting/scripts/importxhtml/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/importxhtml/Makefile" ;;
-+    "kexi/plugins/scripting/scripts/projectdocumentor/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/projectdocumentor/Makefile" ;;
-+    "kexi/plugins/scripting/scripts/python/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/Makefile" ;;
-+    "kexi/plugins/scripting/scripts/python/kexiapp/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/scripting/scripts/python/kexiapp/Makefile" ;;
-+    "kexi/plugins/tables/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/plugins/tables/Makefile" ;;
-+    "kexi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/Makefile" ;;
-+    "kexi/tests/newapi/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/newapi/Makefile" ;;
-+    "kexi/tests/parser/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/parser/Makefile" ;;
-+    "kexi/tests/startup/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/startup/Makefile" ;;
-+    "kexi/tests/tableview/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/tableview/Makefile" ;;
-+    "kexi/tests/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/tests/widgets/Makefile" ;;
-+    "kexi/widget/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/Makefile" ;;
-+    "kexi/widget/relations/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/relations/Makefile" ;;
-+    "kexi/widget/tableview/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/tableview/Makefile" ;;
-+    "kexi/widget/utils/Makefile") CONFIG_FILES="$CONFIG_FILES kexi/widget/utils/Makefile" ;;
-+    "kformula/Makefile") CONFIG_FILES="$CONFIG_FILES kformula/Makefile" ;;
-+    "kformula/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kformula/pics/Makefile" ;;
-+    "kivio/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/Makefile" ;;
-+    "kivio/kiviopart/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/Makefile" ;;
-+    "kivio/kiviopart/config/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/config/Makefile" ;;
-+    "kivio/kiviopart/kiviosdk/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/kiviosdk/Makefile" ;;
-+    "kivio/kiviopart/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/pics/Makefile" ;;
-+    "kivio/kiviopart/stencils/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Assorted/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Assorted/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Circuit/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Circuit/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Cisco/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Cisco/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Civil/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Civil/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Contact/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Contact/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Electric/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Electric/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Jigsaw/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Jigsaw/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/MSE/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/MSE/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Network/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Network/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Pneumatic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Pneumatic/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/SDL/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/SDL/Makefile" ;;
-+    "kivio/kiviopart/stencils/Dia/Sybase/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Dia/Sybase/Makefile" ;;
-+    "kivio/kiviopart/stencils/Flowcharting/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Makefile" ;;
-+    "kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile" ;;
-+    "kivio/kiviopart/stencils/Flowcharting/Extended/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Extended/Makefile" ;;
-+    "kivio/kiviopart/stencils/Flowcharting/Logic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Flowcharting/Logic/Makefile" ;;
-+    "kivio/kiviopart/stencils/Geographic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Makefile" ;;
-+    "kivio/kiviopart/stencils/Geographic/Flags/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Flags/Makefile" ;;
-+    "kivio/kiviopart/stencils/Geographic/Maps/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Geographic/Maps/Makefile" ;;
-+    "kivio/kiviopart/stencils/Hardware/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Makefile" ;;
-+    "kivio/kiviopart/stencils/Hardware/Computer/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Computer/Makefile" ;;
-+    "kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile" ;;
-+    "kivio/kiviopart/stencils/Miscellaneous/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Makefile" ;;
-+    "kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile" ;;
-+    "kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile" ;;
-+    "kivio/kiviopart/stencils/Miscellaneous/ER/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/ER/Makefile" ;;
-+    "kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile" ;;
-+    "kivio/kiviopart/stencils/Miscellaneous/People/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/People/Makefile" ;;
-+    "kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile" ;;
-+    "kivio/kiviopart/stencils/UML/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/Makefile" ;;
-+    "kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile" ;;
-+    "kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile" ;;
-+    "kivio/kiviopart/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tiles/Makefile" ;;
-+    "kivio/kiviopart/tools/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/tools/Makefile" ;;
-+    "kivio/kiviopart/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/kiviopart/ui/Makefile" ;;
-+    "kivio/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/Makefile" ;;
-+    "kivio/plugins/kivioconnectortool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/Makefile" ;;
-+    "kivio/plugins/kivioconnectortool/straight_connector/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioconnectortool/straight_connector/Makefile" ;;
-+    "kivio/plugins/kivioselecttool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/Makefile" ;;
-+    "kivio/plugins/kivioselecttool/select_pics/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kivioselecttool/select_pics/Makefile" ;;
-+    "kivio/plugins/kiviosmlconnector/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/Makefile" ;;
-+    "kivio/plugins/kiviosmlconnector/sml_connector/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviosmlconnector/sml_connector/Makefile" ;;
-+    "kivio/plugins/kiviotargettool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotargettool/Makefile" ;;
-+    "kivio/plugins/kiviotexttool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviotexttool/Makefile" ;;
-+    "kivio/plugins/kiviozoomtool/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/Makefile" ;;
-+    "kivio/plugins/kiviozoomtool/zoom_pics/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/plugins/kiviozoomtool/zoom_pics/Makefile" ;;
-+    "kivio/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/templates/Makefile" ;;
-+    "kivio/templates/basic/Makefile") CONFIG_FILES="$CONFIG_FILES kivio/templates/basic/Makefile" ;;
-+    "koshell/Makefile") CONFIG_FILES="$CONFIG_FILES koshell/Makefile" ;;
-+    "kounavail/Makefile") CONFIG_FILES="$CONFIG_FILES kounavail/Makefile" ;;
-+    "kplato/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/Makefile" ;;
-+    "kplato/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/pics/Makefile" ;;
-+    "kplato/reports/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/reports/Makefile" ;;
-+    "kplato/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/templates/Makefile" ;;
-+    "kplato/templates/Simple/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/templates/Simple/Makefile" ;;
-+    "kplato/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/tests/Makefile" ;;
-+    "kplato/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kplato/toolbar/Makefile" ;;
-+    "kpresenter/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/Makefile" ;;
-+    "kpresenter/autoformEdit/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoformEdit/Makefile" ;;
-+    "kpresenter/autoforms/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Makefile" ;;
-+    "kpresenter/autoforms/Arrows/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Arrows/Makefile" ;;
-+    "kpresenter/autoforms/Connections/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/autoforms/Connections/Makefile" ;;
-+    "kpresenter/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/dtd/Makefile" ;;
-+    "kpresenter/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/pics/Makefile" ;;
-+    "kpresenter/pics/rotate/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/pics/rotate/Makefile" ;;
-+    "kpresenter/slideshow/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/slideshow/Makefile" ;;
-+    "kpresenter/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Makefile" ;;
-+    "kpresenter/templates/A4/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/A4/Makefile" ;;
-+    "kpresenter/templates/Screen/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screen/Makefile" ;;
-+    "kpresenter/templates/Screenpresentations/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/Screenpresentations/Makefile" ;;
-+    "kpresenter/templates/common_icon/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/common_icon/Makefile" ;;
-+    "kpresenter/templates/legal/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/legal/Makefile" ;;
-+    "kpresenter/templates/letter/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/templates/letter/Makefile" ;;
-+    "kpresenter/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kpresenter/toolbar/Makefile" ;;
-+    "krita/Makefile") CONFIG_FILES="$CONFIG_FILES krita/Makefile" ;;
-+    "krita/colorspaces/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/Makefile" ;;
-+    "krita/colorspaces/cmyk_u16/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u16/Makefile" ;;
-+    "krita/colorspaces/cmyk_u8/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/Makefile" ;;
-+    "krita/colorspaces/cmyk_u8/templates/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/cmyk_u8/templates/Makefile" ;;
-+    "krita/colorspaces/gray_u16/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u16/Makefile" ;;
-+    "krita/colorspaces/gray_u8/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/Makefile" ;;
-+    "krita/colorspaces/gray_u8/templates/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/templates/Makefile" ;;
-+    "krita/colorspaces/gray_u8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/gray_u8/tests/Makefile" ;;
-+    "krita/colorspaces/lms_f32/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/lms_f32/Makefile" ;;
-+    "krita/colorspaces/rgb_f16half/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/Makefile" ;;
-+    "krita/colorspaces/rgb_f16half/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f16half/tests/Makefile" ;;
-+    "krita/colorspaces/rgb_f32/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/Makefile" ;;
-+    "krita/colorspaces/rgb_f32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_f32/tests/Makefile" ;;
-+    "krita/colorspaces/rgb_u16/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/Makefile" ;;
-+    "krita/colorspaces/rgb_u16/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u16/tests/Makefile" ;;
-+    "krita/colorspaces/rgb_u8/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/Makefile" ;;
-+    "krita/colorspaces/rgb_u8/templates/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/templates/Makefile" ;;
-+    "krita/colorspaces/rgb_u8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/rgb_u8/tests/Makefile" ;;
-+    "krita/colorspaces/wet/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wet/Makefile" ;;
-+    "krita/colorspaces/wetsticky/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/Makefile" ;;
-+    "krita/colorspaces/wetsticky/brushop/Makefile") CONFIG_FILES="$CONFIG_FILES krita/colorspaces/wetsticky/brushop/Makefile" ;;
-+    "krita/core/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/Makefile" ;;
-+    "krita/core/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/tests/Makefile" ;;
-+    "krita/core/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/tiles/Makefile" ;;
-+    "krita/core/tiles/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/core/tiles/tests/Makefile" ;;
-+    "krita/data/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/Makefile" ;;
-+    "krita/data/brushes/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/brushes/Makefile" ;;
-+    "krita/data/gradients/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/gradients/Makefile" ;;
-+    "krita/data/images/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/images/Makefile" ;;
-+    "krita/data/palettes/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/palettes/Makefile" ;;
-+    "krita/data/patterns/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/patterns/Makefile" ;;
-+    "krita/data/profiles/Makefile") CONFIG_FILES="$CONFIG_FILES krita/data/profiles/Makefile" ;;
-+    "krita/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES krita/dtd/Makefile" ;;
-+    "krita/kritacolor/Makefile") CONFIG_FILES="$CONFIG_FILES krita/kritacolor/Makefile" ;;
-+    "krita/kritacolor/colorspaces/Makefile") CONFIG_FILES="$CONFIG_FILES krita/kritacolor/colorspaces/Makefile" ;;
-+    "krita/kritacolor/tests/Makefile") CONFIG_FILES="$CONFIG_FILES krita/kritacolor/tests/Makefile" ;;
-+    "krita/pics/Makefile") CONFIG_FILES="$CONFIG_FILES krita/pics/Makefile" ;;
-+    "krita/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/Makefile" ;;
-+    "krita/plugins/filters/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/Makefile" ;;
-+    "krita/plugins/filters/bumpmap/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/bumpmap/Makefile" ;;
-+    "krita/plugins/filters/cimg/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cimg/Makefile" ;;
-+    "krita/plugins/filters/colorsfilters/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/colorsfilters/Makefile" ;;
-+    "krita/plugins/filters/convolutionfilters/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/convolutionfilters/Makefile" ;;
-+    "krita/plugins/filters/cubismfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/cubismfilter/Makefile" ;;
-+    "krita/plugins/filters/embossfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/embossfilter/Makefile" ;;
-+    "krita/plugins/filters/example/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/example/Makefile" ;;
-+    "krita/plugins/filters/imageenhancement/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/imageenhancement/Makefile" ;;
-+    "krita/plugins/filters/oilpaintfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/oilpaintfilter/Makefile" ;;
-+    "krita/plugins/filters/pixelizefilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/pixelizefilter/Makefile" ;;
-+    "krita/plugins/filters/raindropsfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/raindropsfilter/Makefile" ;;
-+    "krita/plugins/filters/roundcorners/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/roundcorners/Makefile" ;;
-+    "krita/plugins/filters/smalltilesfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/smalltilesfilter/Makefile" ;;
-+    "krita/plugins/filters/sobelfilter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/sobelfilter/Makefile" ;;
-+    "krita/plugins/filters/threadtest/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/filters/threadtest/Makefile" ;;
-+    "krita/plugins/paintops/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/Makefile" ;;
-+    "krita/plugins/paintops/defaultpaintops/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/defaultpaintops/Makefile" ;;
-+    "krita/plugins/paintops/smearybrush/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/paintops/smearybrush/Makefile" ;;
-+    "krita/plugins/tools/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/Makefile" ;;
-+    "krita/plugins/tools/defaulttools/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/defaulttools/Makefile" ;;
-+    "krita/plugins/tools/selectiontools/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/selectiontools/Makefile" ;;
-+    "krita/plugins/tools/tool_crop/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_crop/Makefile" ;;
-+    "krita/plugins/tools/tool_filter/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_filter/Makefile" ;;
-+    "krita/plugins/tools/tool_polygon/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polygon/Makefile" ;;
-+    "krita/plugins/tools/tool_polyline/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_polyline/Makefile" ;;
-+    "krita/plugins/tools/tool_selectsimilar/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_selectsimilar/Makefile" ;;
-+    "krita/plugins/tools/tool_star/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_star/Makefile" ;;
-+    "krita/plugins/tools/tool_transform/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/tools/tool_transform/Makefile" ;;
-+    "krita/plugins/viewplugins/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/Makefile" ;;
-+    "krita/plugins/viewplugins/colorrange/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorrange/Makefile" ;;
-+    "krita/plugins/viewplugins/colorspaceconversion/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/colorspaceconversion/Makefile" ;;
-+    "krita/plugins/viewplugins/dropshadow/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/dropshadow/Makefile" ;;
-+    "krita/plugins/viewplugins/filtersgallery/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/filtersgallery/Makefile" ;;
-+    "krita/plugins/viewplugins/histogram/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram/Makefile" ;;
-+    "krita/plugins/viewplugins/histogram_docker/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/histogram_docker/Makefile" ;;
-+    "krita/plugins/viewplugins/history_docker/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/history_docker/Makefile" ;;
-+    "krita/plugins/viewplugins/imagesize/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/imagesize/Makefile" ;;
-+    "krita/plugins/viewplugins/performancetest/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/performancetest/Makefile" ;;
-+    "krita/plugins/viewplugins/rotateimage/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/rotateimage/Makefile" ;;
-+    "krita/plugins/viewplugins/screenshot/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/screenshot/Makefile" ;;
-+    "krita/plugins/viewplugins/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/Makefile" ;;
-+    "krita/plugins/viewplugins/scripting/kritacore/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritacore/Makefile" ;;
-+    "krita/plugins/viewplugins/scripting/kritascripting/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/kritascripting/Makefile" ;;
-+    "krita/plugins/viewplugins/scripting/samples/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/Makefile" ;;
-+    "krita/plugins/viewplugins/scripting/samples/python/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/python/Makefile" ;;
-+    "krita/plugins/viewplugins/scripting/samples/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/scripting/samples/ruby/Makefile" ;;
-+    "krita/plugins/viewplugins/separate_channels/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/separate_channels/Makefile" ;;
-+    "krita/plugins/viewplugins/shearimage/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/shearimage/Makefile" ;;
-+    "krita/plugins/viewplugins/variations/Makefile") CONFIG_FILES="$CONFIG_FILES krita/plugins/viewplugins/variations/Makefile" ;;
-+    "krita/sdk/Makefile") CONFIG_FILES="$CONFIG_FILES krita/sdk/Makefile" ;;
-+    "krita/ui/Makefile") CONFIG_FILES="$CONFIG_FILES krita/ui/Makefile" ;;
-+    "kspread/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/Makefile" ;;
-+    "kspread/dialogs/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/dialogs/Makefile" ;;
-+    "kspread/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/dtd/Makefile" ;;
-+    "kspread/extensions/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/extensions/Makefile" ;;
-+    "kspread/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/pics/Makefile" ;;
-+    "kspread/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/Makefile" ;;
-+    "kspread/plugins/calculator/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/Makefile" ;;
-+    "kspread/plugins/calculator/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/calculator/pics/Makefile" ;;
-+    "kspread/plugins/insertcalendar/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/plugins/insertcalendar/Makefile" ;;
-+    "kspread/sheetstyles/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/sheetstyles/Makefile" ;;
-+    "kspread/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/Makefile" ;;
-+    "kspread/templates/Business/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/Business/Makefile" ;;
-+    "kspread/templates/General/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/General/Makefile" ;;
-+    "kspread/templates/HomeFamily/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/templates/HomeFamily/Makefile" ;;
-+    "kspread/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/tests/Makefile" ;;
-+    "kspread/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/toolbar/Makefile" ;;
-+    "kspread/toolbar/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES kspread/toolbar/crystalsvg/Makefile" ;;
-+    "kugar/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/Makefile" ;;
-+    "kugar/kudesigner/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/Makefile" ;;
-+    "kugar/kudesigner/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/pics/Makefile" ;;
-+    "kugar/kudesigner/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/Makefile" ;;
-+    "kugar/kudesigner/templates/General/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/templates/General/Makefile" ;;
-+    "kugar/kudesigner/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner/toolbar/Makefile" ;;
-+    "kugar/kudesigner_lib/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/kudesigner_lib/Makefile" ;;
-+    "kugar/lib/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/lib/Makefile" ;;
-+    "kugar/part/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/part/Makefile" ;;
-+    "kugar/samples/Makefile") CONFIG_FILES="$CONFIG_FILES kugar/samples/Makefile" ;;
-+    "kword/Makefile") CONFIG_FILES="$CONFIG_FILES kword/Makefile" ;;
-+    "kword/data/Makefile") CONFIG_FILES="$CONFIG_FILES kword/data/Makefile" ;;
-+    "kword/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES kword/dtd/Makefile" ;;
-+    "kword/expression/Makefile") CONFIG_FILES="$CONFIG_FILES kword/expression/Makefile" ;;
-+    "kword/horizontalline/Makefile") CONFIG_FILES="$CONFIG_FILES kword/horizontalline/Makefile" ;;
-+    "kword/mailmerge/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/Makefile" ;;
-+    "kword/mailmerge/kabc/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kabc/Makefile" ;;
-+    "kword/mailmerge/kspread/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/kspread/Makefile" ;;
-+    "kword/mailmerge/sql/Makefile") CONFIG_FILES="$CONFIG_FILES kword/mailmerge/sql/Makefile" ;;
-+    "kword/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kword/pics/Makefile" ;;
-+    "kword/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/Makefile" ;;
-+    "kword/templates/CardsAndLabels/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/CardsAndLabels/Makefile" ;;
-+    "kword/templates/Envelopes/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/Envelopes/Makefile" ;;
-+    "kword/templates/Wordprocessing/Makefile") CONFIG_FILES="$CONFIG_FILES kword/templates/Wordprocessing/Makefile" ;;
-+    "kword/tests/Makefile") CONFIG_FILES="$CONFIG_FILES kword/tests/Makefile" ;;
-+    "kword/toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES kword/toolbar/Makefile" ;;
-+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-+    "lib/kformula/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/Makefile" ;;
-+    "lib/kformula/config/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/config/Makefile" ;;
-+    "lib/kformula/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/dtd/Makefile" ;;
-+    "lib/kformula/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/fonts/Makefile" ;;
-+    "lib/kformula/pics/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/Makefile" ;;
-+    "lib/kformula/pics/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kformula/pics/crystalsvg/Makefile" ;;
-+    "lib/kofficecore/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficecore/Makefile" ;;
-+    "lib/kofficecore/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficecore/tests/Makefile" ;;
-+    "lib/kofficeui/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficeui/Makefile" ;;
-+    "lib/kofficeui/pics/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficeui/pics/Makefile" ;;
-+    "lib/kofficeui/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kofficeui/tests/Makefile" ;;
-+    "lib/kopainter/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kopainter/Makefile" ;;
-+    "lib/kopalette/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kopalette/Makefile" ;;
-+    "lib/koproperty/Makefile") CONFIG_FILES="$CONFIG_FILES lib/koproperty/Makefile" ;;
-+    "lib/koproperty/editors/Makefile") CONFIG_FILES="$CONFIG_FILES lib/koproperty/editors/Makefile" ;;
-+    "lib/koproperty/test/Makefile") CONFIG_FILES="$CONFIG_FILES lib/koproperty/test/Makefile" ;;
-+    "lib/kotext/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/Makefile" ;;
-+    "lib/kotext/kohyphen/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/Makefile" ;;
-+    "lib/kotext/kohyphen/hyphdicts/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/kohyphen/hyphdicts/Makefile" ;;
-+    "lib/kotext/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kotext/tests/Makefile" ;;
-+    "lib/kross/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/Makefile" ;;
-+    "lib/kross/api/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/api/Makefile" ;;
-+    "lib/kross/main/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/main/Makefile" ;;
-+    "lib/kross/python/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/Makefile" ;;
-+    "lib/kross/python/CXX/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/CXX/Makefile" ;;
-+    "lib/kross/python/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/Makefile" ;;
-+    "lib/kross/python/scripts/RestrictedPython/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/python/scripts/RestrictedPython/Makefile" ;;
-+    "lib/kross/ruby/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/ruby/Makefile" ;;
-+    "lib/kross/runner/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/runner/Makefile" ;;
-+    "lib/kross/test/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kross/test/Makefile" ;;
-+    "lib/kwmf/Makefile") CONFIG_FILES="$CONFIG_FILES lib/kwmf/Makefile" ;;
-+    "lib/store/Makefile") CONFIG_FILES="$CONFIG_FILES lib/store/Makefile" ;;
-+    "lib/store/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/store/tests/Makefile" ;;
-+    "mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES mimetypes/Makefile" ;;
-+    "mimetypes/kde33/Makefile") CONFIG_FILES="$CONFIG_FILES mimetypes/kde33/Makefile" ;;
-+    "mimetypes/kde351/Makefile") CONFIG_FILES="$CONFIG_FILES mimetypes/kde351/Makefile" ;;
-+    "pics/Makefile") CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;;
-+    "pics/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;;
-+    "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
-+    "plugins/scan/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/scan/Makefile" ;;
-+    "servicetypes/Makefile") CONFIG_FILES="$CONFIG_FILES servicetypes/Makefile" ;;
-+    "templates/Makefile") CONFIG_FILES="$CONFIG_FILES templates/Makefile" ;;
-+    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-+    "tools/converter/Makefile") CONFIG_FILES="$CONFIG_FILES tools/converter/Makefile" ;;
-+    "tools/kfile-plugins/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/Makefile" ;;
-+    "tools/kfile-plugins/abiword/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/abiword/Makefile" ;;
-+    "tools/kfile-plugins/gnumeric/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/gnumeric/Makefile" ;;
-+    "tools/kfile-plugins/koffice/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/koffice/Makefile" ;;
-+    "tools/kfile-plugins/ooo/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kfile-plugins/ooo/Makefile" ;;
-+    "tools/kthesaurus/Makefile") CONFIG_FILES="$CONFIG_FILES tools/kthesaurus/Makefile" ;;
-+    "tools/quickprint/Makefile") CONFIG_FILES="$CONFIG_FILES tools/quickprint/Makefile" ;;
-+    "tools/spell/Makefile") CONFIG_FILES="$CONFIG_FILES tools/spell/Makefile" ;;
-+    "tools/thesaurus/Makefile") CONFIG_FILES="$CONFIG_FILES tools/thesaurus/Makefile" ;;
-+    "tools/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES tools/thumbnail/Makefile" ;;
-+
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
- 
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used.  Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -60241,715 +66085,947 @@
- fi
- 
- # Have a temporary directory for convenience.  Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-   trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
- 
- {
--  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-   test -n "$tmp" && test -d "$tmp"
- }  ||
- {
--  tmp=./confstat$$-$RANDOM
--  (umask 077 && mkdir $tmp)
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
- } ||
- {
-    echo "$me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
- 
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
--  # Protect against being on the right side of a sed subst in config.status.
--  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--s, at host_cpu@,$host_cpu,;t t
--s, at host_vendor@,$host_vendor,;t t
--s, at host_os@,$host_os,;t t
--s, at target@,$target,;t t
--s, at target_cpu@,$target_cpu,;t t
--s, at target_vendor@,$target_vendor,;t t
--s, at target_os@,$target_os,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at CYGPATH_W@,$CYGPATH_W,;t t
--s, at PACKAGE@,$PACKAGE,;t t
--s, at VERSION@,$VERSION,;t t
--s, at ACLOCAL@,$ACLOCAL,;t t
--s, at AUTOCONF@,$AUTOCONF,;t t
--s, at AUTOMAKE@,$AUTOMAKE,;t t
--s, at AUTOHEADER@,$AUTOHEADER,;t t
--s, at MAKEINFO@,$MAKEINFO,;t t
--s, at install_sh@,$install_sh,;t t
--s, at STRIP@,$STRIP,;t t
--s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s, at mkdir_p@,$mkdir_p,;t t
--s, at AWK@,$AWK,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at am__leading_dot@,$am__leading_dot,;t t
--s, at AMTAR@,$AMTAR,;t t
--s, at am__tar@,$am__tar,;t t
--s, at am__untar@,$am__untar,;t t
--s, at KDECONFIG@,$KDECONFIG,;t t
--s, at kde_libs_prefix@,$kde_libs_prefix,;t t
--s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
--s, at CONF_FILES@,$CONF_FILES,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at DEPDIR@,$DEPDIR,;t t
--s, at am__include@,$am__include,;t t
--s, at am__quote@,$am__quote,;t t
--s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s, at CCDEPMODE@,$CCDEPMODE,;t t
--s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s, at CPP@,$CPP,;t t
--s, at CXX@,$CXX,;t t
--s, at CXXFLAGS@,$CXXFLAGS,;t t
--s, at ac_ct_CXX@,$ac_ct_CXX,;t t
--s, at CXXDEPMODE@,$CXXDEPMODE,;t t
--s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
--s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
--s, at WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
--s, at HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t
--s, at unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t
--s, at unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t
--s, at USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
--s, at USE_RTTI@,$USE_RTTI,;t t
--s, at CXXCPP@,$CXXCPP,;t t
--s, at NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
--s, at NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
--s, at ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t
--s, at LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t
--s, at LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t
--s, at KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
--s, at KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
--s, at KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
--s, at KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
--s, at KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
--s, at KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
--s, at KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t
--s, at EGREP@,$EGREP,;t t
--s, at LN_S@,$LN_S,;t t
--s, at ECHO@,$ECHO,;t t
--s, at AR@,$AR,;t t
--s, at ac_ct_AR@,$ac_ct_AR,;t t
--s, at RANLIB@,$RANLIB,;t t
--s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s, at F77@,$F77,;t t
--s, at FFLAGS@,$FFLAGS,;t t
--s, at ac_ct_F77@,$ac_ct_F77,;t t
--s, at LIBTOOL@,$LIBTOOL,;t t
--s, at KDE_PLUGIN@,$KDE_PLUGIN,;t t
--s, at KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t
--s, at MSGFMT@,$MSGFMT,;t t
--s, at GMSGFMT@,$GMSGFMT,;t t
--s, at XGETTEXT@,$XGETTEXT,;t t
--s, at LIBUTIL@,$LIBUTIL,;t t
--s, at LIBCOMPAT@,$LIBCOMPAT,;t t
--s, at LIBCRYPT@,$LIBCRYPT,;t t
--s, at LIBRESOLV@,$LIBRESOLV,;t t
--s, at LIB_POLL@,$LIB_POLL,;t t
--s, at FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
--s, at LIBSOCKET@,$LIBSOCKET,;t t
--s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s, at LIBUCB@,$LIBUCB,;t t
--s, at LIBDL@,$LIBDL,;t t
--s, at KDE_USE_FPIE@,$KDE_USE_FPIE,;t t
--s, at KDE_USE_PIE@,$KDE_USE_PIE,;t t
--s, at include_x11_TRUE@,$include_x11_TRUE,;t t
--s, at include_x11_FALSE@,$include_x11_FALSE,;t t
--s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
--s, at LIB_X11@,$LIB_X11,;t t
--s, at LIB_XRENDER@,$LIB_XRENDER,;t t
--s, at LIBSM@,$LIBSM,;t t
--s, at X_INCLUDES@,$X_INCLUDES,;t t
--s, at X_LDFLAGS@,$X_LDFLAGS,;t t
--s, at x_includes@,$x_includes,;t t
--s, at x_libraries@,$x_libraries,;t t
--s, at QTE_NORTTI@,$QTE_NORTTI,;t t
--s, at LIB_XEXT@,$LIB_XEXT,;t t
--s, at LIBPTHREAD@,$LIBPTHREAD,;t t
--s, at USE_THREADS@,$USE_THREADS,;t t
--s, at KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
--s, at KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
--s, at USER_INCLUDES@,$USER_INCLUDES,;t t
--s, at USER_LDFLAGS@,$USER_LDFLAGS,;t t
--s, at LIBZ@,$LIBZ,;t t
--s, at LIBPNG@,$LIBPNG,;t t
--s, at LIBJPEG@,$LIBJPEG,;t t
--s, at qt_libraries@,$qt_libraries,;t t
--s, at qt_includes@,$qt_includes,;t t
--s, at QT_INCLUDES@,$QT_INCLUDES,;t t
--s, at QT_LDFLAGS@,$QT_LDFLAGS,;t t
--s, at PERL@,$PERL,;t t
--s, at MOC@,$MOC,;t t
--s, at UIC@,$UIC,;t t
--s, at UIC_TR@,$UIC_TR,;t t
--s, at LIB_QT@,$LIB_QT,;t t
--s, at LIB_QPE@,$LIB_QPE,;t t
--s, at kde_qtver@,$kde_qtver,;t t
--s, at KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
--s, at KDE_RPATH@,$KDE_RPATH,;t t
--s, at X_RPATH@,$X_RPATH,;t t
--s, at kde_libraries@,$kde_libraries,;t t
--s, at kde_includes@,$kde_includes,;t t
--s, at KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
--s, at KDE_INCLUDES@,$KDE_INCLUDES,;t t
--s, at all_includes@,$all_includes,;t t
--s, at all_libraries@,$all_libraries,;t t
--s, at AUTODIRS@,$AUTODIRS,;t t
--s, at include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
--s, at include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
--s, at MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t
--s, at KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
--s, at KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
--s, at DCOPIDLNG@,$DCOPIDLNG,;t t
--s, at DCOPIDL@,$DCOPIDL,;t t
--s, at DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
--s, at DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
--s, at MCOPIDL@,$MCOPIDL,;t t
--s, at ARTSCCONFIG@,$ARTSCCONFIG,;t t
--s, at MEINPROC@,$MEINPROC,;t t
--s, at KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
--s, at XMLLINT@,$XMLLINT,;t t
--s, at kde_htmldir@,$kde_htmldir,;t t
--s, at kde_appsdir@,$kde_appsdir,;t t
--s, at kde_icondir@,$kde_icondir,;t t
--s, at kde_sounddir@,$kde_sounddir,;t t
--s, at kde_datadir@,$kde_datadir,;t t
--s, at kde_locale@,$kde_locale,;t t
--s, at kde_confdir@,$kde_confdir,;t t
--s, at kde_kcfgdir@,$kde_kcfgdir,;t t
--s, at kde_mimedir@,$kde_mimedir,;t t
--s, at kde_wallpaperdir@,$kde_wallpaperdir,;t t
--s, at kde_bindir@,$kde_bindir,;t t
--s, at xdg_appsdir@,$xdg_appsdir,;t t
--s, at xdg_menudir@,$xdg_menudir,;t t
--s, at xdg_directorydir@,$xdg_directorydir,;t t
--s, at kde_templatesdir@,$kde_templatesdir,;t t
--s, at kde_servicesdir@,$kde_servicesdir,;t t
--s, at kde_servicetypesdir@,$kde_servicetypesdir,;t t
--s, at kde_moduledir@,$kde_moduledir,;t t
--s, at kdeinitdir@,$kdeinitdir,;t t
--s, at kde_styledir@,$kde_styledir,;t t
--s, at kde_widgetdir@,$kde_widgetdir,;t t
--s, at LIB_KDED@,$LIB_KDED,;t t
--s, at LIB_KDECORE@,$LIB_KDECORE,;t t
--s, at LIB_KDEUI@,$LIB_KDEUI,;t t
--s, at LIB_KIO@,$LIB_KIO,;t t
--s, at LIB_KJS@,$LIB_KJS,;t t
--s, at LIB_SMB@,$LIB_SMB,;t t
--s, at LIB_KAB@,$LIB_KAB,;t t
--s, at LIB_KABC@,$LIB_KABC,;t t
--s, at LIB_KHTML@,$LIB_KHTML,;t t
--s, at LIB_KSPELL@,$LIB_KSPELL,;t t
--s, at LIB_KPARTS@,$LIB_KPARTS,;t t
--s, at LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
--s, at LIB_KUTILS@,$LIB_KUTILS,;t t
--s, at LIB_KDEPIM@,$LIB_KDEPIM,;t t
--s, at LIB_KIMPROXY@,$LIB_KIMPROXY,;t t
--s, at LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t
--s, at LIB_KDNSSD@,$LIB_KDNSSD,;t t
--s, at LIB_KUNITTEST@,$LIB_KUNITTEST,;t t
--s, at LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
--s, at LIB_KFILE@,$LIB_KFILE,;t t
--s, at LIB_KFM@,$LIB_KFM,;t t
--s, at QTDOCDIR@,$QTDOCDIR,;t t
--s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
--s, at DOXYGEN@,$DOXYGEN,;t t
--s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
--s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
--s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
--s, at LIBMAGICK_LIBS@,$LIBMAGICK_LIBS,;t t
--s, at LIBMAGICK_LDFLAGS@,$LIBMAGICK_LDFLAGS,;t t
--s, at LIBMAGICK_CPPFLAGS@,$LIBMAGICK_CPPFLAGS,;t t
--s, at LIBMAGICK_RPATH@,$LIBMAGICK_RPATH,;t t
--s, at include_imagemagick_filter_TRUE@,$include_imagemagick_filter_TRUE,;t t
--s, at include_imagemagick_filter_FALSE@,$include_imagemagick_filter_FALSE,;t t
--s, at need_kde32_compatibility_TRUE@,$need_kde32_compatibility_TRUE,;t t
--s, at need_kde32_compatibility_FALSE@,$need_kde32_compatibility_FALSE,;t t
--s, at need_kde33_compatibility_TRUE@,$need_kde33_compatibility_TRUE,;t t
--s, at need_kde33_compatibility_FALSE@,$need_kde33_compatibility_FALSE,;t t
--s, at need_kde34_compatibility_TRUE@,$need_kde34_compatibility_TRUE,;t t
--s, at need_kde34_compatibility_FALSE@,$need_kde34_compatibility_FALSE,;t t
--s, at need_kde351_compatibility_TRUE@,$need_kde351_compatibility_TRUE,;t t
--s, at need_kde351_compatibility_FALSE@,$need_kde351_compatibility_FALSE,;t t
--s, at need_kde31_compatibility_TRUE@,$need_kde31_compatibility_TRUE,;t t
--s, at need_kde31_compatibility_FALSE@,$need_kde31_compatibility_FALSE,;t t
--s, at OPENEXR_LIBS@,$OPENEXR_LIBS,;t t
--s, at OPENEXR_CFLAGS@,$OPENEXR_CFLAGS,;t t
--s, at OPENEXR_RPATH@,$OPENEXR_RPATH,;t t
--s, at have_openexr_TRUE@,$have_openexr_TRUE,;t t
--s, at have_openexr_FALSE@,$have_openexr_FALSE,;t t
--s, at LIBTIFF@,$LIBTIFF,;t t
--s, at have_tiff_TRUE@,$have_tiff_TRUE,;t t
--s, at have_tiff_FALSE@,$have_tiff_FALSE,;t t
--s, at have_png_TRUE@,$have_png_TRUE,;t t
--s, at have_png_FALSE@,$have_png_FALSE,;t t
--s, at have_jpeg_TRUE@,$have_jpeg_TRUE,;t t
--s, at have_jpeg_FALSE@,$have_jpeg_FALSE,;t t
--s, at PKG_CONFIG@,$PKG_CONFIG,;t t
--s, at LIBEXIF_CFLAGS@,$LIBEXIF_CFLAGS,;t t
--s, at LIBEXIF_LIBS@,$LIBEXIF_LIBS,;t t
--s, at have_exif_TRUE@,$have_exif_TRUE,;t t
--s, at have_exif_FALSE@,$have_exif_FALSE,;t t
--s, at include_jpeg_filter_TRUE@,$include_jpeg_filter_TRUE,;t t
--s, at include_jpeg_filter_FALSE@,$include_jpeg_filter_FALSE,;t t
--s, at include_tiff_filter_TRUE@,$include_tiff_filter_TRUE,;t t
--s, at include_tiff_filter_FALSE@,$include_tiff_filter_FALSE,;t t
--s, at LIBWV2_LIBS@,$LIBWV2_LIBS,;t t
--s, at LIBWV2_CFLAGS@,$LIBWV2_CFLAGS,;t t
--s, at LIBWV2_RPATH@,$LIBWV2_RPATH,;t t
--s, at include_wv2_msword_filter_TRUE@,$include_wv2_msword_filter_TRUE,;t t
--s, at include_wv2_msword_filter_FALSE@,$include_wv2_msword_filter_FALSE,;t t
--s, at LIBPAPER@,$LIBPAPER,;t t
--s, at LIBWPD_LIBS@,$LIBWPD_LIBS,;t t
--s, at LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t
--s, at LIBWPD_RPATH@,$LIBWPD_RPATH,;t t
--s, at include_wpd_filter_TRUE@,$include_wpd_filter_TRUE,;t t
--s, at include_wpd_filter_FALSE@,$include_wpd_filter_FALSE,;t t
--s, at LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t
--s, at LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t
--s, at LIBXSLT_RPATH@,$LIBXSLT_RPATH,;t t
--s, at LIBXML_LIBS@,$LIBXML_LIBS,;t t
--s, at LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t
--s, at LIBXML_RPATH@,$LIBXML_RPATH,;t t
--s, at include_XSLTFILTERS_TRUE@,$include_XSLTFILTERS_TRUE,;t t
--s, at include_XSLTFILTERS_FALSE@,$include_XSLTFILTERS_FALSE,;t t
--s, at LIBFREETYPE_LIBS@,$LIBFREETYPE_LIBS,;t t
--s, at LIBFREETYPE_CFLAGS@,$LIBFREETYPE_CFLAGS,;t t
--s, at LIBFREETYPE_RPATH@,$LIBFREETYPE_RPATH,;t t
--s, at LIBART_LIBS@,$LIBART_LIBS,;t t
--s, at LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
--s, at LIBART_RPATH@,$LIBART_RPATH,;t t
--s, at LIBFONTCONFIG_LIBS@,$LIBFONTCONFIG_LIBS,;t t
--s, at LIBFONTCONFIG_CFLAGS@,$LIBFONTCONFIG_CFLAGS,;t t
--s, at LIBFONTCONFIG_RPATH@,$LIBFONTCONFIG_RPATH,;t t
--s, at have_readline_TRUE@,$have_readline_TRUE,;t t
--s, at have_readline_FALSE@,$have_readline_FALSE,;t t
--s, at LIBREADLINE@,$LIBREADLINE,;t t
--s, at LIB_KEXI_KMDI@,$LIB_KEXI_KMDI,;t t
--s, at LIB_KEXI_KMDI_INCLUDES@,$LIB_KEXI_KMDI_INCLUDES,;t t
--s, at MYSQL_INC@,$MYSQL_INC,;t t
--s, at MYSQL_LIBS@,$MYSQL_LIBS,;t t
--s, at compile_mysql_plugin_TRUE@,$compile_mysql_plugin_TRUE,;t t
--s, at compile_mysql_plugin_FALSE@,$compile_mysql_plugin_FALSE,;t t
--s, at PG_INCDIR@,$PG_INCDIR,;t t
--s, at PG_LIBDIR@,$PG_LIBDIR,;t t
--s, at compile_pgsql_plugin_TRUE@,$compile_pgsql_plugin_TRUE,;t t
--s, at compile_pgsql_plugin_FALSE@,$compile_pgsql_plugin_FALSE,;t t
--s, at PQXX_INCDIR@,$PQXX_INCDIR,;t t
--s, at PQXX_LIBDIR@,$PQXX_LIBDIR,;t t
--s, at LIB_KFEEDBACK@,$LIB_KFEEDBACK,;t t
--s, at INC_KFEEDBACK@,$INC_KFEEDBACK,;t t
--s, at use_kexifeedback_TRUE@,$use_kexifeedback_TRUE,;t t
--s, at use_kexifeedback_FALSE@,$use_kexifeedback_FALSE,;t t
--s, at PYTHONINC@,$PYTHONINC,;t t
--s, at PYTHONLIB@,$PYTHONLIB,;t t
--s, at LIBPYTHON@,$LIBPYTHON,;t t
--s, at PYTHONMODDIR@,$PYTHONMODDIR,;t t
--s, at LIB_XINPUTEXT@,$LIB_XINPUTEXT,;t t
--s, at LCMS_LIBS@,$LCMS_LIBS,;t t
--s, at include_kunittest_tests_TRUE@,$include_kunittest_tests_TRUE,;t t
--s, at include_kunittest_tests_FALSE@,$include_kunittest_tests_FALSE,;t t
--s, at GLINC@,$GLINC,;t t
--s, at GLLIB@,$GLLIB,;t t
--s, at use_kjsembed_TRUE@,$use_kjsembed_TRUE,;t t
--s, at use_kjsembed_FALSE@,$use_kjsembed_FALSE,;t t
--s, at SQLDIR@,$SQLDIR,;t t
--s, at include_sql_TRUE@,$include_sql_TRUE,;t t
--s, at include_sql_FALSE@,$include_sql_FALSE,;t t
--s, at KWMF_INCLUDES@,$KWMF_INCLUDES,;t t
--s, at KSTORE_INCLUDES@,$KSTORE_INCLUDES,;t t
--s, at KOTEXT_INCLUDES@,$KOTEXT_INCLUDES,;t t
--s, at KOPAINTER_INCLUDES@,$KOPAINTER_INCLUDES,;t t
--s, at KOPALETTE_INCLUDES@,$KOPALETTE_INCLUDES,;t t
--s, at KOFFICECORE_INCLUDES@,$KOFFICECORE_INCLUDES,;t t
--s, at KOFFICEUI_INCLUDES@,$KOFFICEUI_INCLUDES,;t t
--s, at KFORMULA_INCLUDES@,$KFORMULA_INCLUDES,;t t
--s, at KOPROPERTY_INCLUDES@,$KOPROPERTY_INCLUDES,;t t
--s, at KROSS_INCLUDES@,$KROSS_INCLUDES,;t t
--s, at LIB_KOFFICEUI@,$LIB_KOFFICEUI,;t t
--s, at LIB_KOFFICECORE@,$LIB_KOFFICECORE,;t t
--s, at LIB_KSTORE@,$LIB_KSTORE,;t t
--s, at LIB_KOTEXT@,$LIB_KOTEXT,;t t
--s, at LIB_KOPAINTER@,$LIB_KOPAINTER,;t t
--s, at LIB_KOPALETTE@,$LIB_KOPALETTE,;t t
--s, at LIB_KWMF@,$LIB_KWMF,;t t
--s, at LIB_KOWMF@,$LIB_KOWMF,;t t
--s, at LIB_KFORMULA@,$LIB_KFORMULA,;t t
--s, at LIB_KOPROPERTY@,$LIB_KOPROPERTY,;t t
--s, at LIB_KROSS_API@,$LIB_KROSS_API,;t t
--s, at LIB_KROSS_MAIN@,$LIB_KROSS_MAIN,;t t
--s, at interfacedir@,$interfacedir,;t t
--s, at KOFFICE_LIBS@,$KOFFICE_LIBS,;t t
--s, at KOFFICE_INCLUDES@,$KOFFICE_INCLUDES,;t t
--s, at LIBKSPELL2@,$LIBKSPELL2,;t t
--s, at compile_kross_TRUE@,$compile_kross_TRUE,;t t
--s, at compile_kross_FALSE@,$compile_kross_FALSE,;t t
--s, at compile_kross_python_TRUE@,$compile_kross_python_TRUE,;t t
--s, at compile_kross_python_FALSE@,$compile_kross_python_FALSE,;t t
--s, at RUBY@,$RUBY,;t t
--s, at RUBY_ARCHDIR@,$RUBY_ARCHDIR,;t t
--s, at RUBY_SITEARCHDIR@,$RUBY_SITEARCHDIR,;t t
--s, at RUBY_SITEDIR@,$RUBY_SITEDIR,;t t
--s, at RUBY_INCLUDEDIR@,$RUBY_INCLUDEDIR,;t t
--s, at RUBY_LIBDIR@,$RUBY_LIBDIR,;t t
--s, at RUBY_LIBRUBYARG@,$RUBY_LIBRUBYARG,;t t
--s, at RUBY_ENABLESHARED@,$RUBY_ENABLESHARED,;t t
--s, at compile_kross_ruby_TRUE@,$compile_kross_ruby_TRUE,;t t
--s, at compile_kross_ruby_FALSE@,$compile_kross_ruby_FALSE,;t t
--s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
--s, at lib_SUBDIR_included_TRUE@,$lib_SUBDIR_included_TRUE,;t t
--s, at lib_SUBDIR_included_FALSE@,$lib_SUBDIR_included_FALSE,;t t
--s, at interfaces_SUBDIR_included_TRUE@,$interfaces_SUBDIR_included_TRUE,;t t
--s, at interfaces_SUBDIR_included_FALSE@,$interfaces_SUBDIR_included_FALSE,;t t
--s, at autocorrect_SUBDIR_included_TRUE@,$autocorrect_SUBDIR_included_TRUE,;t t
--s, at autocorrect_SUBDIR_included_FALSE@,$autocorrect_SUBDIR_included_FALSE,;t t
--s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
--s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
--s, at example_SUBDIR_included_TRUE@,$example_SUBDIR_included_TRUE,;t t
--s, at example_SUBDIR_included_FALSE@,$example_SUBDIR_included_FALSE,;t t
--s, at karbon_SUBDIR_included_TRUE@,$karbon_SUBDIR_included_TRUE,;t t
--s, at karbon_SUBDIR_included_FALSE@,$karbon_SUBDIR_included_FALSE,;t t
--s, at kchart_SUBDIR_included_TRUE@,$kchart_SUBDIR_included_TRUE,;t t
--s, at kchart_SUBDIR_included_FALSE@,$kchart_SUBDIR_included_FALSE,;t t
--s, at kdgantt_SUBDIR_included_TRUE@,$kdgantt_SUBDIR_included_TRUE,;t t
--s, at kdgantt_SUBDIR_included_FALSE@,$kdgantt_SUBDIR_included_FALSE,;t t
--s, at kformula_SUBDIR_included_TRUE@,$kformula_SUBDIR_included_TRUE,;t t
--s, at kformula_SUBDIR_included_FALSE@,$kformula_SUBDIR_included_FALSE,;t t
--s, at kivio_SUBDIR_included_TRUE@,$kivio_SUBDIR_included_TRUE,;t t
--s, at kivio_SUBDIR_included_FALSE@,$kivio_SUBDIR_included_FALSE,;t t
--s, at koshell_SUBDIR_included_TRUE@,$koshell_SUBDIR_included_TRUE,;t t
--s, at koshell_SUBDIR_included_FALSE@,$koshell_SUBDIR_included_FALSE,;t t
--s, at kounavail_SUBDIR_included_TRUE@,$kounavail_SUBDIR_included_TRUE,;t t
--s, at kounavail_SUBDIR_included_FALSE@,$kounavail_SUBDIR_included_FALSE,;t t
--s, at kpresenter_SUBDIR_included_TRUE@,$kpresenter_SUBDIR_included_TRUE,;t t
--s, at kpresenter_SUBDIR_included_FALSE@,$kpresenter_SUBDIR_included_FALSE,;t t
--s, at krita_SUBDIR_included_TRUE@,$krita_SUBDIR_included_TRUE,;t t
--s, at krita_SUBDIR_included_FALSE@,$krita_SUBDIR_included_FALSE,;t t
--s, at kspread_SUBDIR_included_TRUE@,$kspread_SUBDIR_included_TRUE,;t t
--s, at kspread_SUBDIR_included_FALSE@,$kspread_SUBDIR_included_FALSE,;t t
--s, at kugar_SUBDIR_included_TRUE@,$kugar_SUBDIR_included_TRUE,;t t
--s, at kugar_SUBDIR_included_FALSE@,$kugar_SUBDIR_included_FALSE,;t t
--s, at mimetypes_SUBDIR_included_TRUE@,$mimetypes_SUBDIR_included_TRUE,;t t
--s, at mimetypes_SUBDIR_included_FALSE@,$mimetypes_SUBDIR_included_FALSE,;t t
--s, at pics_SUBDIR_included_TRUE@,$pics_SUBDIR_included_TRUE,;t t
--s, at pics_SUBDIR_included_FALSE@,$pics_SUBDIR_included_FALSE,;t t
--s, at plugins_SUBDIR_included_TRUE@,$plugins_SUBDIR_included_TRUE,;t t
--s, at plugins_SUBDIR_included_FALSE@,$plugins_SUBDIR_included_FALSE,;t t
--s, at servicetypes_SUBDIR_included_TRUE@,$servicetypes_SUBDIR_included_TRUE,;t t
--s, at servicetypes_SUBDIR_included_FALSE@,$servicetypes_SUBDIR_included_FALSE,;t t
--s, at templates_SUBDIR_included_TRUE@,$templates_SUBDIR_included_TRUE,;t t
--s, at templates_SUBDIR_included_FALSE@,$templates_SUBDIR_included_FALSE,;t t
--s, at tools_SUBDIR_included_TRUE@,$tools_SUBDIR_included_TRUE,;t t
--s, at tools_SUBDIR_included_FALSE@,$tools_SUBDIR_included_FALSE,;t t
--s, at kword_SUBDIR_included_TRUE@,$kword_SUBDIR_included_TRUE,;t t
--s, at kword_SUBDIR_included_FALSE@,$kword_SUBDIR_included_FALSE,;t t
--s, at kplato_SUBDIR_included_TRUE@,$kplato_SUBDIR_included_TRUE,;t t
--s, at kplato_SUBDIR_included_FALSE@,$kplato_SUBDIR_included_FALSE,;t t
--s, at kexi_SUBDIR_included_TRUE@,$kexi_SUBDIR_included_TRUE,;t t
--s, at kexi_SUBDIR_included_FALSE@,$kexi_SUBDIR_included_FALSE,;t t
--s, at filters_SUBDIR_included_TRUE@,$filters_SUBDIR_included_TRUE,;t t
--s, at filters_SUBDIR_included_FALSE@,$filters_SUBDIR_included_FALSE,;t t
--s, at compile_filter_KWORD_TRUE@,$compile_filter_KWORD_TRUE,;t t
--s, at compile_filter_KWORD_FALSE@,$compile_filter_KWORD_FALSE,;t t
--s, at compile_filter_KSPREAD_TRUE@,$compile_filter_KSPREAD_TRUE,;t t
--s, at compile_filter_KSPREAD_FALSE@,$compile_filter_KSPREAD_FALSE,;t t
--s, at compile_filter_KCHART_TRUE@,$compile_filter_KCHART_TRUE,;t t
--s, at compile_filter_KCHART_FALSE@,$compile_filter_KCHART_FALSE,;t t
--s, at compile_filter_KARBON_TRUE@,$compile_filter_KARBON_TRUE,;t t
--s, at compile_filter_KARBON_FALSE@,$compile_filter_KARBON_FALSE,;t t
--s, at compile_filter_KPRESENTER_TRUE@,$compile_filter_KPRESENTER_TRUE,;t t
--s, at compile_filter_KPRESENTER_FALSE@,$compile_filter_KPRESENTER_FALSE,;t t
--s, at compile_filter_KFORMULA_TRUE@,$compile_filter_KFORMULA_TRUE,;t t
--s, at compile_filter_KFORMULA_FALSE@,$compile_filter_KFORMULA_FALSE,;t t
--s, at compile_filter_KUGAR_TRUE@,$compile_filter_KUGAR_TRUE,;t t
--s, at compile_filter_KUGAR_FALSE@,$compile_filter_KUGAR_FALSE,;t t
--s, at compile_filter_KRITA_TRUE@,$compile_filter_KRITA_TRUE,;t t
--s, at compile_filter_KRITA_FALSE@,$compile_filter_KRITA_FALSE,;t t
--s, at compile_filter_KIVIO_TRUE@,$compile_filter_KIVIO_TRUE,;t t
--s, at compile_filter_KIVIO_FALSE@,$compile_filter_KIVIO_FALSE,;t t
--s, at compile_plugin_KUGAR_TRUE@,$compile_plugin_KUGAR_TRUE,;t t
--s, at compile_plugin_KUGAR_FALSE@,$compile_plugin_KUGAR_FALSE,;t t
--s, at compile_kexionly_TRUE@,$compile_kexionly_TRUE,;t t
--s, at compile_kexionly_FALSE@,$compile_kexionly_FALSE,;t t
--s, at compile_lib_KOPAINTER_TRUE@,$compile_lib_KOPAINTER_TRUE,;t t
--s, at compile_lib_KOPAINTER_FALSE@,$compile_lib_KOPAINTER_FALSE,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
--  cat >>$CONFIG_STATUS <<\_ACEOF
--  # Split the substitutions into bite-sized pieces for seds with
--  # small command number limits, like on Digital OSF/1 and HP-UX.
--  ac_max_sed_lines=48
--  ac_sed_frag=1 # Number of current file.
--  ac_beg=1 # First line for current file.
--  ac_end=$ac_max_sed_lines # Line after last line for current file.
--  ac_more_lines=:
--  ac_sed_cmds=
--  while $ac_more_lines; do
--    if test $ac_beg -gt 1; then
--      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    else
--      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    fi
--    if test ! -s $tmp/subs.frag; then
--      ac_more_lines=false
--    else
--      # The purpose of the label and of the branching condition is to
--      # speed up the sed processing (if there are no `@' at all, there
--      # is no need to browse any of the substitutions).
--      # These are the two extra sed commands mentioned above.
--      (echo ':t
--  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--      if test -z "$ac_sed_cmds"; then
--	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
--      else
--	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--      fi
--      ac_sed_frag=`expr $ac_sed_frag + 1`
--      ac_beg=$ac_end
--      ac_end=`expr $ac_end + $ac_max_sed_lines`
--    fi
--  done
--  if test -z "$ac_sed_cmds"; then
--    ac_sed_cmds=cat
-+if test -n "$CONFIG_FILES"; then
-+
-+_ACEOF
-+
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+target!$target$ac_delim
-+target_cpu!$target_cpu$ac_delim
-+target_vendor!$target_vendor$ac_delim
-+target_os!$target_os$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+CYGPATH_W!$CYGPATH_W$ac_delim
-+PACKAGE!$PACKAGE$ac_delim
-+VERSION!$VERSION$ac_delim
-+ACLOCAL!$ACLOCAL$ac_delim
-+AUTOCONF!$AUTOCONF$ac_delim
-+AUTOMAKE!$AUTOMAKE$ac_delim
-+AUTOHEADER!$AUTOHEADER$ac_delim
-+MAKEINFO!$MAKEINFO$ac_delim
-+install_sh!$install_sh$ac_delim
-+STRIP!$STRIP$ac_delim
-+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-+mkdir_p!$mkdir_p$ac_delim
-+AWK!$AWK$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+am__leading_dot!$am__leading_dot$ac_delim
-+AMTAR!$AMTAR$ac_delim
-+am__tar!$am__tar$ac_delim
-+am__untar!$am__untar$ac_delim
+ Copyright (C) 2006 Free Software Foundation, Inc.
+@@ -70729,6 +70472,9 @@
+ AMTAR!$AMTAR$ac_delim
+ am__tar!$am__tar$ac_delim
+ am__untar!$am__untar$ac_delim
 +MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
 +MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
 +MAINT!$MAINT$ac_delim
-+KDECONFIG!$KDECONFIG$ac_delim
-+kde_libs_prefix!$kde_libs_prefix$ac_delim
-+kde_libs_htmldir!$kde_libs_htmldir$ac_delim
-+CONF_FILES!$CONF_FILES$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+DEPDIR!$DEPDIR$ac_delim
-+am__include!$am__include$ac_delim
-+am__quote!$am__quote$ac_delim
-+AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-+AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-+CCDEPMODE!$CCDEPMODE$ac_delim
-+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+CPP!$CPP$ac_delim
-+CXX!$CXX$ac_delim
-+CXXFLAGS!$CXXFLAGS$ac_delim
-+ac_ct_CXX!$ac_ct_CXX$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
+ KDECONFIG!$KDECONFIG$ac_delim
+ kde_libs_prefix!$kde_libs_prefix$ac_delim
+ kde_libs_htmldir!$kde_libs_htmldir$ac_delim
+@@ -70753,9 +70499,6 @@
+ CXX!$CXX$ac_delim
+ CXXFLAGS!$CXXFLAGS$ac_delim
+ ac_ct_CXX!$ac_ct_CXX$ac_delim
+-CXXDEPMODE!$CXXDEPMODE$ac_delim
+-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -70797,6 +70540,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +CXXDEPMODE!$CXXDEPMODE$ac_delim
 +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
 +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-+WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
-+HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
-+unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
-+unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim
-+USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim
-+USE_RTTI!$USE_RTTI$ac_delim
-+CXXCPP!$CXXCPP$ac_delim
-+NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim
-+NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim
-+ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim
-+LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim
-+LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim
-+KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim
-+KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim
-+KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim
-+KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim
-+KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim
-+KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim
-+KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+LN_S!$LN_S$ac_delim
-+ECHO!$ECHO$ac_delim
-+AR!$AR$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+F77!$F77$ac_delim
-+FFLAGS!$FFLAGS$ac_delim
-+ac_ct_F77!$ac_ct_F77$ac_delim
-+LIBTOOL!$LIBTOOL$ac_delim
-+KDE_PLUGIN!$KDE_PLUGIN$ac_delim
-+KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim
-+MSGFMT!$MSGFMT$ac_delim
-+GMSGFMT!$GMSGFMT$ac_delim
-+XGETTEXT!$XGETTEXT$ac_delim
-+LIBUTIL!$LIBUTIL$ac_delim
-+LIBCOMPAT!$LIBCOMPAT$ac_delim
-+LIBCRYPT!$LIBCRYPT$ac_delim
-+LIBRESOLV!$LIBRESOLV$ac_delim
-+LIB_POLL!$LIB_POLL$ac_delim
-+FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim
-+LIBSOCKET!$LIBSOCKET$ac_delim
-+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+LIBUCB!$LIBUCB$ac_delim
-+LIBDL!$LIBDL$ac_delim
-+KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim
-+KDE_USE_PIE!$KDE_USE_PIE$ac_delim
-+include_x11_TRUE!$include_x11_TRUE$ac_delim
-+include_x11_FALSE!$include_x11_FALSE$ac_delim
-+XMKMF!$XMKMF$ac_delim
-+X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-+LIB_X11!$LIB_X11$ac_delim
-+LIB_XRENDER!$LIB_XRENDER$ac_delim
-+LIBSM!$LIBSM$ac_delim
-+X_INCLUDES!$X_INCLUDES$ac_delim
-+X_LDFLAGS!$X_LDFLAGS$ac_delim
-+x_includes!$x_includes$ac_delim
-+x_libraries!$x_libraries$ac_delim
-+QTE_NORTTI!$QTE_NORTTI$ac_delim
-+LIB_XEXT!$LIB_XEXT$ac_delim
-+LIBPTHREAD!$LIBPTHREAD$ac_delim
-+USE_THREADS!$USE_THREADS$ac_delim
-+KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim
-+KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim
-+USER_INCLUDES!$USER_INCLUDES$ac_delim
-+USER_LDFLAGS!$USER_LDFLAGS$ac_delim
-+LIBZ!$LIBZ$ac_delim
-+LIBPNG!$LIBPNG$ac_delim
-+LIBJPEG!$LIBJPEG$ac_delim
-+qt_libraries!$qt_libraries$ac_delim
-+qt_includes!$qt_includes$ac_delim
-+QT_INCLUDES!$QT_INCLUDES$ac_delim
-+QT_LDFLAGS!$QT_LDFLAGS$ac_delim
-+PERL!$PERL$ac_delim
-+MOC!$MOC$ac_delim
-+UIC!$UIC$ac_delim
-+UIC_TR!$UIC_TR$ac_delim
-+LIB_QT!$LIB_QT$ac_delim
-+LIB_QPE!$LIB_QPE$ac_delim
-+kde_qtver!$kde_qtver$ac_delim
-+KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim
-+KDE_RPATH!$KDE_RPATH$ac_delim
-+X_RPATH!$X_RPATH$ac_delim
-+kde_libraries!$kde_libraries$ac_delim
-+kde_includes!$kde_includes$ac_delim
-+KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim
-+KDE_INCLUDES!$KDE_INCLUDES$ac_delim
-+all_includes!$all_includes$ac_delim
-+all_libraries!$all_libraries$ac_delim
-+AUTODIRS!$AUTODIRS$ac_delim
-+include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim
-+include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim
-+MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
-+KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
-+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
+ WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim
+ HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim
+ unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim
+@@ -70891,9 +70637,6 @@
+ MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim
+ KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim
+ KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
+-DCOPIDLNG!$DCOPIDLNG$ac_delim
+-DCOPIDL!$DCOPIDL$ac_delim
+-DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -70935,6 +70678,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +DCOPIDLNG!$DCOPIDLNG$ac_delim
 +DCOPIDL!$DCOPIDL$ac_delim
 +DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim
-+DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
-+MCOPIDL!$MCOPIDL$ac_delim
-+ARTSCCONFIG!$ARTSCCONFIG$ac_delim
-+MEINPROC!$MEINPROC$ac_delim
-+KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim
-+XMLLINT!$XMLLINT$ac_delim
-+kde_htmldir!$kde_htmldir$ac_delim
-+kde_appsdir!$kde_appsdir$ac_delim
-+kde_icondir!$kde_icondir$ac_delim
-+kde_sounddir!$kde_sounddir$ac_delim
-+kde_datadir!$kde_datadir$ac_delim
-+kde_locale!$kde_locale$ac_delim
-+kde_confdir!$kde_confdir$ac_delim
-+kde_kcfgdir!$kde_kcfgdir$ac_delim
-+kde_mimedir!$kde_mimedir$ac_delim
-+kde_wallpaperdir!$kde_wallpaperdir$ac_delim
-+kde_bindir!$kde_bindir$ac_delim
-+xdg_appsdir!$xdg_appsdir$ac_delim
-+xdg_menudir!$xdg_menudir$ac_delim
-+xdg_directorydir!$xdg_directorydir$ac_delim
-+kde_templatesdir!$kde_templatesdir$ac_delim
-+kde_servicesdir!$kde_servicesdir$ac_delim
-+kde_servicetypesdir!$kde_servicetypesdir$ac_delim
-+kde_moduledir!$kde_moduledir$ac_delim
-+kdeinitdir!$kdeinitdir$ac_delim
-+kde_styledir!$kde_styledir$ac_delim
-+kde_widgetdir!$kde_widgetdir$ac_delim
-+LIB_KDED!$LIB_KDED$ac_delim
-+LIB_KDECORE!$LIB_KDECORE$ac_delim
-+LIB_KDEUI!$LIB_KDEUI$ac_delim
-+LIB_KIO!$LIB_KIO$ac_delim
-+LIB_KJS!$LIB_KJS$ac_delim
-+LIB_SMB!$LIB_SMB$ac_delim
-+LIB_KAB!$LIB_KAB$ac_delim
-+LIB_KABC!$LIB_KABC$ac_delim
-+LIB_KHTML!$LIB_KHTML$ac_delim
-+LIB_KSPELL!$LIB_KSPELL$ac_delim
-+LIB_KPARTS!$LIB_KPARTS$ac_delim
-+LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim
-+LIB_KUTILS!$LIB_KUTILS$ac_delim
-+LIB_KDEPIM!$LIB_KDEPIM$ac_delim
-+LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim
-+LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim
-+LIB_KDNSSD!$LIB_KDNSSD$ac_delim
-+LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim
-+LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim
-+LIB_KFILE!$LIB_KFILE$ac_delim
-+LIB_KFM!$LIB_KFM$ac_delim
-+QTDOCDIR!$QTDOCDIR$ac_delim
-+KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim
-+DOXYGEN!$DOXYGEN$ac_delim
-+DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim
-+DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim
-+KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim
-+LIBMAGICK_LIBS!$LIBMAGICK_LIBS$ac_delim
-+LIBMAGICK_LDFLAGS!$LIBMAGICK_LDFLAGS$ac_delim
-+LIBMAGICK_CPPFLAGS!$LIBMAGICK_CPPFLAGS$ac_delim
-+LIBMAGICK_RPATH!$LIBMAGICK_RPATH$ac_delim
-+include_imagemagick_filter_TRUE!$include_imagemagick_filter_TRUE$ac_delim
-+include_imagemagick_filter_FALSE!$include_imagemagick_filter_FALSE$ac_delim
-+need_kde32_compatibility_TRUE!$need_kde32_compatibility_TRUE$ac_delim
-+need_kde32_compatibility_FALSE!$need_kde32_compatibility_FALSE$ac_delim
-+need_kde33_compatibility_TRUE!$need_kde33_compatibility_TRUE$ac_delim
-+need_kde33_compatibility_FALSE!$need_kde33_compatibility_FALSE$ac_delim
-+need_kde34_compatibility_TRUE!$need_kde34_compatibility_TRUE$ac_delim
-+need_kde34_compatibility_FALSE!$need_kde34_compatibility_FALSE$ac_delim
-+need_kde351_compatibility_TRUE!$need_kde351_compatibility_TRUE$ac_delim
-+need_kde351_compatibility_FALSE!$need_kde351_compatibility_FALSE$ac_delim
-+need_kde31_compatibility_TRUE!$need_kde31_compatibility_TRUE$ac_delim
-+need_kde31_compatibility_FALSE!$need_kde31_compatibility_FALSE$ac_delim
-+OPENEXR_LIBS!$OPENEXR_LIBS$ac_delim
-+OPENEXR_CFLAGS!$OPENEXR_CFLAGS$ac_delim
-+OPENEXR_RPATH!$OPENEXR_RPATH$ac_delim
-+have_openexr_TRUE!$have_openexr_TRUE$ac_delim
-+have_openexr_FALSE!$have_openexr_FALSE$ac_delim
-+LIBTIFF!$LIBTIFF$ac_delim
-+have_tiff_TRUE!$have_tiff_TRUE$ac_delim
-+have_tiff_FALSE!$have_tiff_FALSE$ac_delim
-+have_png_TRUE!$have_png_TRUE$ac_delim
-+have_png_FALSE!$have_png_FALSE$ac_delim
-+have_jpeg_TRUE!$have_jpeg_TRUE$ac_delim
-+have_jpeg_FALSE!$have_jpeg_FALSE$ac_delim
-+PKG_CONFIG!$PKG_CONFIG$ac_delim
-+LIBEXIF_CFLAGS!$LIBEXIF_CFLAGS$ac_delim
-+LIBEXIF_LIBS!$LIBEXIF_LIBS$ac_delim
-+have_exif_TRUE!$have_exif_TRUE$ac_delim
-+have_exif_FALSE!$have_exif_FALSE$ac_delim
-+include_jpeg_filter_TRUE!$include_jpeg_filter_TRUE$ac_delim
+ DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim
+ MCOPIDL!$MCOPIDL$ac_delim
+ ARTSCCONFIG!$ARTSCCONFIG$ac_delim
+@@ -71029,9 +70775,6 @@
+ have_exif_TRUE!$have_exif_TRUE$ac_delim
+ have_exif_FALSE!$have_exif_FALSE$ac_delim
+ include_jpeg_filter_TRUE!$include_jpeg_filter_TRUE$ac_delim
+-include_jpeg_filter_FALSE!$include_jpeg_filter_FALSE$ac_delim
+-include_tiff_filter_TRUE!$include_tiff_filter_TRUE$ac_delim
+-include_tiff_filter_FALSE!$include_tiff_filter_FALSE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -71073,6 +70816,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +include_jpeg_filter_FALSE!$include_jpeg_filter_FALSE$ac_delim
 +include_tiff_filter_TRUE!$include_tiff_filter_TRUE$ac_delim
 +include_tiff_filter_FALSE!$include_tiff_filter_FALSE$ac_delim
-+LIBWV2_LIBS!$LIBWV2_LIBS$ac_delim
-+LIBWV2_CFLAGS!$LIBWV2_CFLAGS$ac_delim
-+LIBWV2_RPATH!$LIBWV2_RPATH$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+include_wv2_msword_filter_TRUE!$include_wv2_msword_filter_TRUE$ac_delim
-+include_wv2_msword_filter_FALSE!$include_wv2_msword_filter_FALSE$ac_delim
-+LIBPAPER!$LIBPAPER$ac_delim
-+LIBWPD_LIBS!$LIBWPD_LIBS$ac_delim
-+LIBWPD_CFLAGS!$LIBWPD_CFLAGS$ac_delim
-+LIBWPD_RPATH!$LIBWPD_RPATH$ac_delim
-+include_wpd_filter_TRUE!$include_wpd_filter_TRUE$ac_delim
-+include_wpd_filter_FALSE!$include_wpd_filter_FALSE$ac_delim
-+LIBXSLT_LIBS!$LIBXSLT_LIBS$ac_delim
-+LIBXSLT_CFLAGS!$LIBXSLT_CFLAGS$ac_delim
-+LIBXSLT_RPATH!$LIBXSLT_RPATH$ac_delim
-+LIBXML_LIBS!$LIBXML_LIBS$ac_delim
-+LIBXML_CFLAGS!$LIBXML_CFLAGS$ac_delim
-+LIBXML_RPATH!$LIBXML_RPATH$ac_delim
-+include_XSLTFILTERS_TRUE!$include_XSLTFILTERS_TRUE$ac_delim
-+include_XSLTFILTERS_FALSE!$include_XSLTFILTERS_FALSE$ac_delim
-+LIBFREETYPE_LIBS!$LIBFREETYPE_LIBS$ac_delim
-+LIBFREETYPE_CFLAGS!$LIBFREETYPE_CFLAGS$ac_delim
-+LIBFREETYPE_RPATH!$LIBFREETYPE_RPATH$ac_delim
-+LIBART_LIBS!$LIBART_LIBS$ac_delim
-+LIBART_CFLAGS!$LIBART_CFLAGS$ac_delim
-+LIBART_RPATH!$LIBART_RPATH$ac_delim
-+LIBFONTCONFIG_LIBS!$LIBFONTCONFIG_LIBS$ac_delim
-+LIBFONTCONFIG_CFLAGS!$LIBFONTCONFIG_CFLAGS$ac_delim
-+LIBFONTCONFIG_RPATH!$LIBFONTCONFIG_RPATH$ac_delim
-+have_readline_TRUE!$have_readline_TRUE$ac_delim
-+have_readline_FALSE!$have_readline_FALSE$ac_delim
-+LIBREADLINE!$LIBREADLINE$ac_delim
-+LIB_KEXI_KMDI!$LIB_KEXI_KMDI$ac_delim
-+LIB_KEXI_KMDI_INCLUDES!$LIB_KEXI_KMDI_INCLUDES$ac_delim
-+MYSQL_INC!$MYSQL_INC$ac_delim
-+MYSQL_LIBS!$MYSQL_LIBS$ac_delim
-+compile_mysql_plugin_TRUE!$compile_mysql_plugin_TRUE$ac_delim
-+compile_mysql_plugin_FALSE!$compile_mysql_plugin_FALSE$ac_delim
-+PG_INCDIR!$PG_INCDIR$ac_delim
-+PG_LIBDIR!$PG_LIBDIR$ac_delim
-+compile_pgsql_plugin_TRUE!$compile_pgsql_plugin_TRUE$ac_delim
-+compile_pgsql_plugin_FALSE!$compile_pgsql_plugin_FALSE$ac_delim
-+PQXX_INCDIR!$PQXX_INCDIR$ac_delim
-+PQXX_LIBDIR!$PQXX_LIBDIR$ac_delim
-+LIB_KFEEDBACK!$LIB_KFEEDBACK$ac_delim
-+INC_KFEEDBACK!$INC_KFEEDBACK$ac_delim
-+use_kexifeedback_TRUE!$use_kexifeedback_TRUE$ac_delim
-+use_kexifeedback_FALSE!$use_kexifeedback_FALSE$ac_delim
-+PYTHONINC!$PYTHONINC$ac_delim
-+PYTHONLIB!$PYTHONLIB$ac_delim
-+LIBPYTHON!$LIBPYTHON$ac_delim
-+PYTHONMODDIR!$PYTHONMODDIR$ac_delim
-+LIB_XINPUTEXT!$LIB_XINPUTEXT$ac_delim
-+LCMS_LIBS!$LCMS_LIBS$ac_delim
-+include_kunittest_tests_TRUE!$include_kunittest_tests_TRUE$ac_delim
-+include_kunittest_tests_FALSE!$include_kunittest_tests_FALSE$ac_delim
-+GLINC!$GLINC$ac_delim
-+GLLIB!$GLLIB$ac_delim
-+use_kjsembed_TRUE!$use_kjsembed_TRUE$ac_delim
-+use_kjsembed_FALSE!$use_kjsembed_FALSE$ac_delim
-+SQLDIR!$SQLDIR$ac_delim
-+include_sql_TRUE!$include_sql_TRUE$ac_delim
-+include_sql_FALSE!$include_sql_FALSE$ac_delim
-+KWMF_INCLUDES!$KWMF_INCLUDES$ac_delim
-+KSTORE_INCLUDES!$KSTORE_INCLUDES$ac_delim
-+KOTEXT_INCLUDES!$KOTEXT_INCLUDES$ac_delim
-+KOPAINTER_INCLUDES!$KOPAINTER_INCLUDES$ac_delim
-+KOPALETTE_INCLUDES!$KOPALETTE_INCLUDES$ac_delim
-+KOFFICECORE_INCLUDES!$KOFFICECORE_INCLUDES$ac_delim
-+KOFFICEUI_INCLUDES!$KOFFICEUI_INCLUDES$ac_delim
-+KFORMULA_INCLUDES!$KFORMULA_INCLUDES$ac_delim
-+KOPROPERTY_INCLUDES!$KOPROPERTY_INCLUDES$ac_delim
-+KROSS_INCLUDES!$KROSS_INCLUDES$ac_delim
-+LIB_KOFFICEUI!$LIB_KOFFICEUI$ac_delim
-+LIB_KOFFICECORE!$LIB_KOFFICECORE$ac_delim
-+LIB_KSTORE!$LIB_KSTORE$ac_delim
-+LIB_KOTEXT!$LIB_KOTEXT$ac_delim
-+LIB_KOPAINTER!$LIB_KOPAINTER$ac_delim
-+LIB_KOPALETTE!$LIB_KOPALETTE$ac_delim
-+LIB_KWMF!$LIB_KWMF$ac_delim
-+LIB_KOWMF!$LIB_KOWMF$ac_delim
-+LIB_KFORMULA!$LIB_KFORMULA$ac_delim
-+LIB_KOPROPERTY!$LIB_KOPROPERTY$ac_delim
+ POPPLER_CFLAGS!$POPPLER_CFLAGS$ac_delim
+ POPPLER_LIBS!$POPPLER_LIBS$ac_delim
+ include_PDF_TRUE!$include_PDF_TRUE$ac_delim
+@@ -71167,9 +70913,6 @@
+ LIB_KOWMF!$LIB_KOWMF$ac_delim
+ LIB_KFORMULA!$LIB_KFORMULA$ac_delim
+ LIB_KOPROPERTY!$LIB_KOPROPERTY$ac_delim
+-LIB_KROSS_API!$LIB_KROSS_API$ac_delim
+-LIB_KROSS_MAIN!$LIB_KROSS_MAIN$ac_delim
+-interfacedir!$interfacedir$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -71211,6 +70954,9 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +LIB_KROSS_API!$LIB_KROSS_API$ac_delim
 +LIB_KROSS_MAIN!$LIB_KROSS_MAIN$ac_delim
 +interfacedir!$interfacedir$ac_delim
-+KOFFICE_LIBS!$KOFFICE_LIBS$ac_delim
-+KOFFICE_INCLUDES!$KOFFICE_INCLUDES$ac_delim
-+LIBKSPELL2!$LIBKSPELL2$ac_delim
-+compile_kross_TRUE!$compile_kross_TRUE$ac_delim
-+compile_kross_FALSE!$compile_kross_FALSE$ac_delim
-+compile_kross_python_TRUE!$compile_kross_python_TRUE$ac_delim
-+compile_kross_python_FALSE!$compile_kross_python_FALSE$ac_delim
-+RUBY!$RUBY$ac_delim
-+RUBY_ARCHDIR!$RUBY_ARCHDIR$ac_delim
-+RUBY_SITEARCHDIR!$RUBY_SITEARCHDIR$ac_delim
-+RUBY_SITEDIR!$RUBY_SITEDIR$ac_delim
-+RUBY_INCLUDEDIR!$RUBY_INCLUDEDIR$ac_delim
-+RUBY_LIBDIR!$RUBY_LIBDIR$ac_delim
-+RUBY_LIBRUBYARG!$RUBY_LIBRUBYARG$ac_delim
-+RUBY_ENABLESHARED!$RUBY_ENABLESHARED$ac_delim
-+_ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-+
+ KOFFICE_LIBS!$KOFFICE_LIBS$ac_delim
+ KOFFICE_INCLUDES!$KOFFICE_INCLUDES$ac_delim
+ LIBKSPELL2!$LIBKSPELL2$ac_delim
+@@ -71305,9 +71051,6 @@
+ compile_plugin_KUGAR_FALSE!$compile_plugin_KUGAR_FALSE$ac_delim
+ compile_kexionly_TRUE!$compile_kexionly_TRUE$ac_delim
+ compile_kexionly_FALSE!$compile_kexionly_FALSE$ac_delim
+-compile_lib_KOPAINTER_TRUE!$compile_lib_KOPAINTER_TRUE$ac_delim
+-compile_lib_KOPAINTER_FALSE!$compile_lib_KOPAINTER_FALSE$ac_delim
+-LIBOBJS!$LIBOBJS$ac_delim
+ _ACEOF
  
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  cat >conf$$subs.sed <<_ACEOF
-+compile_kross_ruby_TRUE!$compile_kross_ruby_TRUE$ac_delim
-+compile_kross_ruby_FALSE!$compile_kross_ruby_FALSE$ac_delim
-+TOPSUBDIRS!$TOPSUBDIRS$ac_delim
-+lib_SUBDIR_included_TRUE!$lib_SUBDIR_included_TRUE$ac_delim
-+lib_SUBDIR_included_FALSE!$lib_SUBDIR_included_FALSE$ac_delim
-+interfaces_SUBDIR_included_TRUE!$interfaces_SUBDIR_included_TRUE$ac_delim
-+interfaces_SUBDIR_included_FALSE!$interfaces_SUBDIR_included_FALSE$ac_delim
-+autocorrect_SUBDIR_included_TRUE!$autocorrect_SUBDIR_included_TRUE$ac_delim
-+autocorrect_SUBDIR_included_FALSE!$autocorrect_SUBDIR_included_FALSE$ac_delim
-+doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim
-+doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim
-+example_SUBDIR_included_TRUE!$example_SUBDIR_included_TRUE$ac_delim
-+example_SUBDIR_included_FALSE!$example_SUBDIR_included_FALSE$ac_delim
-+karbon_SUBDIR_included_TRUE!$karbon_SUBDIR_included_TRUE$ac_delim
-+karbon_SUBDIR_included_FALSE!$karbon_SUBDIR_included_FALSE$ac_delim
-+kchart_SUBDIR_included_TRUE!$kchart_SUBDIR_included_TRUE$ac_delim
-+kchart_SUBDIR_included_FALSE!$kchart_SUBDIR_included_FALSE$ac_delim
-+kdgantt_SUBDIR_included_TRUE!$kdgantt_SUBDIR_included_TRUE$ac_delim
-+kdgantt_SUBDIR_included_FALSE!$kdgantt_SUBDIR_included_FALSE$ac_delim
-+kformula_SUBDIR_included_TRUE!$kformula_SUBDIR_included_TRUE$ac_delim
-+kformula_SUBDIR_included_FALSE!$kformula_SUBDIR_included_FALSE$ac_delim
-+kivio_SUBDIR_included_TRUE!$kivio_SUBDIR_included_TRUE$ac_delim
-+kivio_SUBDIR_included_FALSE!$kivio_SUBDIR_included_FALSE$ac_delim
-+koshell_SUBDIR_included_TRUE!$koshell_SUBDIR_included_TRUE$ac_delim
-+koshell_SUBDIR_included_FALSE!$koshell_SUBDIR_included_FALSE$ac_delim
-+kounavail_SUBDIR_included_TRUE!$kounavail_SUBDIR_included_TRUE$ac_delim
-+kounavail_SUBDIR_included_FALSE!$kounavail_SUBDIR_included_FALSE$ac_delim
-+kpresenter_SUBDIR_included_TRUE!$kpresenter_SUBDIR_included_TRUE$ac_delim
-+kpresenter_SUBDIR_included_FALSE!$kpresenter_SUBDIR_included_FALSE$ac_delim
-+krita_SUBDIR_included_TRUE!$krita_SUBDIR_included_TRUE$ac_delim
-+krita_SUBDIR_included_FALSE!$krita_SUBDIR_included_FALSE$ac_delim
-+kspread_SUBDIR_included_TRUE!$kspread_SUBDIR_included_TRUE$ac_delim
-+kspread_SUBDIR_included_FALSE!$kspread_SUBDIR_included_FALSE$ac_delim
-+kugar_SUBDIR_included_TRUE!$kugar_SUBDIR_included_TRUE$ac_delim
-+kugar_SUBDIR_included_FALSE!$kugar_SUBDIR_included_FALSE$ac_delim
-+mimetypes_SUBDIR_included_TRUE!$mimetypes_SUBDIR_included_TRUE$ac_delim
-+mimetypes_SUBDIR_included_FALSE!$mimetypes_SUBDIR_included_FALSE$ac_delim
-+pics_SUBDIR_included_TRUE!$pics_SUBDIR_included_TRUE$ac_delim
-+pics_SUBDIR_included_FALSE!$pics_SUBDIR_included_FALSE$ac_delim
-+plugins_SUBDIR_included_TRUE!$plugins_SUBDIR_included_TRUE$ac_delim
-+plugins_SUBDIR_included_FALSE!$plugins_SUBDIR_included_FALSE$ac_delim
-+servicetypes_SUBDIR_included_TRUE!$servicetypes_SUBDIR_included_TRUE$ac_delim
-+servicetypes_SUBDIR_included_FALSE!$servicetypes_SUBDIR_included_FALSE$ac_delim
-+templates_SUBDIR_included_TRUE!$templates_SUBDIR_included_TRUE$ac_delim
-+templates_SUBDIR_included_FALSE!$templates_SUBDIR_included_FALSE$ac_delim
-+tools_SUBDIR_included_TRUE!$tools_SUBDIR_included_TRUE$ac_delim
-+tools_SUBDIR_included_FALSE!$tools_SUBDIR_included_FALSE$ac_delim
-+kword_SUBDIR_included_TRUE!$kword_SUBDIR_included_TRUE$ac_delim
-+kword_SUBDIR_included_FALSE!$kword_SUBDIR_included_FALSE$ac_delim
-+kplato_SUBDIR_included_TRUE!$kplato_SUBDIR_included_TRUE$ac_delim
-+kplato_SUBDIR_included_FALSE!$kplato_SUBDIR_included_FALSE$ac_delim
-+kexi_SUBDIR_included_TRUE!$kexi_SUBDIR_included_TRUE$ac_delim
-+kexi_SUBDIR_included_FALSE!$kexi_SUBDIR_included_FALSE$ac_delim
-+filters_SUBDIR_included_TRUE!$filters_SUBDIR_included_TRUE$ac_delim
-+filters_SUBDIR_included_FALSE!$filters_SUBDIR_included_FALSE$ac_delim
-+compile_filter_KWORD_TRUE!$compile_filter_KWORD_TRUE$ac_delim
-+compile_filter_KWORD_FALSE!$compile_filter_KWORD_FALSE$ac_delim
-+compile_filter_KSPREAD_TRUE!$compile_filter_KSPREAD_TRUE$ac_delim
-+compile_filter_KSPREAD_FALSE!$compile_filter_KSPREAD_FALSE$ac_delim
-+compile_filter_KCHART_TRUE!$compile_filter_KCHART_TRUE$ac_delim
-+compile_filter_KCHART_FALSE!$compile_filter_KCHART_FALSE$ac_delim
-+compile_filter_KARBON_TRUE!$compile_filter_KARBON_TRUE$ac_delim
-+compile_filter_KARBON_FALSE!$compile_filter_KARBON_FALSE$ac_delim
-+compile_filter_KPRESENTER_TRUE!$compile_filter_KPRESENTER_TRUE$ac_delim
-+compile_filter_KPRESENTER_FALSE!$compile_filter_KPRESENTER_FALSE$ac_delim
-+compile_filter_KFORMULA_TRUE!$compile_filter_KFORMULA_TRUE$ac_delim
-+compile_filter_KFORMULA_FALSE!$compile_filter_KFORMULA_FALSE$ac_delim
-+compile_filter_KUGAR_TRUE!$compile_filter_KUGAR_TRUE$ac_delim
-+compile_filter_KUGAR_FALSE!$compile_filter_KUGAR_FALSE$ac_delim
-+compile_filter_KRITA_TRUE!$compile_filter_KRITA_TRUE$ac_delim
-+compile_filter_KRITA_FALSE!$compile_filter_KRITA_FALSE$ac_delim
-+compile_filter_KIVIO_TRUE!$compile_filter_KIVIO_TRUE$ac_delim
-+compile_filter_KIVIO_FALSE!$compile_filter_KIVIO_FALSE$ac_delim
-+compile_plugin_KUGAR_TRUE!$compile_plugin_KUGAR_TRUE$ac_delim
-+compile_plugin_KUGAR_FALSE!$compile_plugin_KUGAR_FALSE$ac_delim
-+compile_kexionly_TRUE!$compile_kexionly_TRUE$ac_delim
-+compile_kexionly_FALSE!$compile_kexionly_FALSE$ac_delim
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -71349,10 +71092,13 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
 +compile_lib_KOPAINTER_TRUE!$compile_lib_KOPAINTER_TRUE$ac_delim
 +compile_lib_KOPAINTER_FALSE!$compile_lib_KOPAINTER_FALSE$ac_delim
 +LIBOBJS!$LIBOBJS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
-+
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
-+    break
-+  elif $ac_last_try; then
-+    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+  ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+   { (exit 1); exit 1; }; };;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+   { (exit 1); exit 1; }; };;
-+      esac
-+      ac_file_inputs="$ac_file_inputs $ac_f"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input="Generated from "`IFS=:
-+	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin";;
-+    esac
-+    ;;
-   esac
  
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+  ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  { as_dir="$ac_dir"
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-     done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--
-   ac_builddir=.
- 
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
- 
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
- 
-   case $INSTALL in
-   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
--  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-   esac
-+_ACEOF
- 
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--				     sed 's,.*/,,'` by configure."
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+    s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
- _ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
- $extrasub
-@@ -60957,248 +67033,129 @@
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--s, at INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$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'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
- 
--#
--# CONFIG_HEADER section.
--#
--
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
--ac_dB='[	 ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
--
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+  rm -f "$tmp/stdin"
-   case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
-+  -) cat "$tmp/out"; rm -f "$tmp/out";;
-+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-   esac
--
--  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 # Do quote $f, to prevent DOS paths from being IFS'd.
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--  # Remove the trailing spaces.
--  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
--
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
- _ACEOF
- 
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h.  The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status.  Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless.  Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status.  If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless.  But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-+ac_dB='\\)[	 (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
- 
--# This sed command replaces #undef with comments.  This is necessary, for
-+uniq confdefs.h |
-+  sed -n '
-+	t rset
-+	:rset
-+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-+	t ok
-+	d
-+	:ok
-+	s/[\\&,]/\\&/g
-+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+  ' >>conftest.defines
-+
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments.  This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[	 #]*u.*,/* & */,' >>conftest.defines
-+
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
- 
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo '  :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
--do
--  # Write a limited-size here document to $tmp/defines.sed.
--  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#define' lines.
--  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+while :
-+do
-+  # Write a here document:
-+    cat >>$CONFIG_STATUS <<_ACEOF
-+    # First, check the format of the line:
-+    cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-+b
-+:def
-+_ACEOF
-+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-   echo 'CEOF
--  sed -f $tmp/defines.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+  grep . conftest.tail >/dev/null || break
-   rm -f conftest.defines
-   mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo '  fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
--  # Write a limited-size here document to $tmp/undefs.sed.
--  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#undef'
--  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
--  echo 'CEOF
--  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
--  rm -f conftest.undefs
--  mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
- 
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    echo "/* Generated by configure.  */" >$tmp/config.h
--  else
--    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
--  fi
--  cat $tmp/in >>$tmp/config.h
--  rm -f $tmp/in
-   if test x"$ac_file" != x-; then
--    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+    echo "/* $configure_input  */" >"$tmp/config.h"
-+    cat "$ac_result" >>"$tmp/config.h"
-+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
--      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_file" : 'X\(//\)[^/]' \| \
--	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--      { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
-       rm -f $ac_file
--      mv $tmp/config.h $ac_file
-+      mv "$tmp/config.h" $ac_file
-     fi
-   else
--    cat $tmp/config.h
--    rm -f $tmp/config.h
-+    echo "/* $configure_input  */"
-+    cat "$ac_result"
-   fi
-+  rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-@@ -61209,135 +67166,39 @@
-       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
- done
--echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X$ac_file : 'X\(//\)[^/]' \| \
- 	 X$ac_file : 'X\(//\)$' \| \
--	 X$ac_file : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
- echo X$ac_file |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`/stamp-h$_am_stamp_count
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
--  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
--  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
--  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_dest" : 'X\(//\)[^/]' \| \
--	 X"$ac_dest" : 'X\(//\)$' \| \
--	 X"$ac_dest" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
--  ac_builddir=.
--
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
--
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
- 
- 
--  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
--  case $ac_dest in
--    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-   # Strip MF so we end up with the name of the file.
-   mf=`echo "$mf" | sed -e 's/:.*$//'`
-   # Check whether this is an Automake generated Makefile or not.
-@@ -61347,18 +67208,29 @@
-   # each Makefile.in and add a new line on top of each file to say so.
-   # So let's grep whole file.
-   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--    dirpart=`(dirname "$mf") 2>/dev/null ||
-+    dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
--	 X"$mf" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$mf" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   else
-     continue
-   fi
-@@ -61380,53 +67252,79 @@
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-     # Make sure the directory exists.
-     test -f "$dirpart/$file" && continue
--    fdir=`(dirname "$file") 2>/dev/null ||
-+    fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
--	 X"$file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    { if $as_mkdir_p; then
--    mkdir -p $dirpart/$fdir
--  else
--    as_dir=$dirpart/$fdir
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    { as_dir=$dirpart/$fdir
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-     as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-     done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
--
-     # echo "creating $dirpart/$file"
-     echo '# dummy' > "$dirpart/$file"
-   done
- done
-  ;;
-+
-   esac
--done
--_ACEOF
-+done # for ac_tag
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
- 
- { (exit 0); exit 0; }
- _ACEOF
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 --- configure.in
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(koffice, "1.5.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(koffice, "1.6.0") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -431,7 +433,8 @@
+@@ -480,7 +482,8 @@
    vers=`$WV2_CONFIG --version 2>/dev/null | $SED -e 's/libwv2 //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
    if test -n "$vers" && test "$vers" -ge 1009
    then
@@ -62269,15 +19395,7 @@
  	  case $args in
 --- doc/karbon/Makefile.in
 +++ doc/karbon/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62287,70 +19405,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62359,7 +19414,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62373,15 +19428,7 @@
  mostlyclean-libtool:
 --- doc/kchart/Makefile.in
 +++ doc/kchart/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62391,70 +19438,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62463,7 +19447,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62477,15 +19461,7 @@
  mostlyclean-libtool:
 --- doc/kexi/Makefile.in
 +++ doc/kexi/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62495,70 +19471,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62567,7 +19480,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62581,15 +19494,7 @@
  mostlyclean-libtool:
 --- doc/kformula/Makefile.in
 +++ doc/kformula/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62599,70 +19504,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62671,7 +19513,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62685,15 +19527,7 @@
  mostlyclean-libtool:
 --- doc/kivio/Makefile.in
 +++ doc/kivio/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62703,70 +19537,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62775,7 +19546,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62789,15 +19560,7 @@
  mostlyclean-libtool:
 --- doc/koffice/Makefile.in
 +++ doc/koffice/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62807,70 +19570,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62879,7 +19579,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62893,15 +19593,7 @@
  mostlyclean-libtool:
 --- doc/koshell/Makefile.in
 +++ doc/koshell/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62911,70 +19603,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62983,7 +19612,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62997,15 +19626,7 @@
  mostlyclean-libtool:
 --- doc/kplato/Makefile.in
 +++ doc/kplato/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63015,70 +19636,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63087,7 +19645,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63101,15 +19659,7 @@
  mostlyclean-libtool:
 --- doc/kpresenter/Makefile.in
 +++ doc/kpresenter/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63119,70 +19669,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63191,7 +19678,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63205,15 +19692,7 @@
  mostlyclean-libtool:
 --- doc/krita/Makefile.in
 +++ doc/krita/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63223,70 +19702,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63295,7 +19711,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63307,50 +19723,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -706,7 +715,7 @@
- KDE_DIST=dialogs-colorrange.png crocusses-sobel.png crocusses-topedge.png tutorial-quick-starts12.png palettes-controlbox-contiguousfill.png dialogs-customconvolution.png using-selections-5.png settings.docbook tutorial-quick-starts6.png using-selections-2.png developers.docbook toolbar-brushes-patterns-custompattern.png tool-polygon.png palettes-layers-layers.png palettes-controlbox-rectangle.png index.docbook dialogs-convertlayertype.png dialogs-emboss.png palettes-colors-rgb.png palettes-controlbox-polygon.png tutorial-select-layer-1.png crocusses-bumpmap.png tool-selectoutline.png commands-palettes.docbook toolbar-brushes-patterns.png dialogs-imagesize.png dialogs-bumpmap.png preferences-performance.png tool-duplicate.png palettes-controlbox-paintwithfilters.png tool-text.png tutorial-select-layer-9.png tool-brush.png dialogs-roundcorners.png palettes-layers-scriptsmanager.png dialogs-convertimagetype.png crocusses-edgeright.png dialogs-layerproperties.png preferences-color.png dialogs-imagerestoration.png palettes-colors-palettes.png tool-pan.png tool-line.png tool-paintselection.png palettes-controlbox-transform.png crocusses-sharpen.png faq.docbook crocusses-raindrops.png tool-move.png dialogs-dropshadow.png palettes-controlbox-select.png tool-selectelliptical.png toolbar-file.png crocusses.png palettes-controlbox-selectcontiguous.png tool-selectrectangular.png toolbar-edit.png palettes-controlbox-star.png tutorial-select-layer-7.png tutorial-select-layer-13.png preferences-sidebar.png tutorial-quick-starts5.png using-filters.docbook tutorial-select-layer-5.png toolbar-brushesandstuff.png palettes-controlbox-brush.png crocusses-edgebottom.png palettes-controlbox-overview.png dialogs-shearimage.png palettes-controlbox-selectsimilar.png crocusses-embossvariable.png toolbar-krita.png toolbar-transformationtools.png Makefile.in palettes-colors-hsv.png tutorial-select-layer-3.png dialogs-histogram.png commands-menus.docbook crocusses-tiles.png introduction.docbook tutorial-quick-starts1.png dialogs-documentinformation.png using-selections-4.png crocusses-invert.png crocusses-embosshorvert.png newimage.png palettes-controlbox-text.png using-selections.docbook tutorial-select-layer-sample.png installation.docbook palettes-colors-watercolors.png tool-rectangle.png dialogs-coloradjustment.png tutorial-select-layer-10.png dialogs-cubism.png toolbar-brushes-brushshapes-predefined.png crocusses-edgeleft.png dialogs-addpalette.png crocusses-embossall.png tool-transform.png preferences-grid.png using-layers.docbook crocusses-roundcorners.png tutorial-select-layer-4.png dialogs-filtersgallery.png tool-selectpolygonal.png dialogs-newlayer.png tool-star.png tutorial-quick-starts10.png dialogs-brightnesscontrast.png using-selections-3.png commands-dialogs.docbook palettes-controlbox-histogram.png dialogs-rotateimage.png tutorial-select-layer-2.png scripting.docbook tutorial-quick-starts8.png dialogs-pixelize.png tutorial-quick-starts.docbook tool-ellipse.png credits.docbook crocusses-simplenoise.png dialogs-layersize.png dialogs-shearlayer.png tutorial.docbook commands.docbook tool-contiguousfill.png palettes-controlbox-line.png tutorial-quick-starts3.png crocusses-pixelize.png tutorial-select-layer-12.png dialogs-rotatelayer.png commands-toolbars.docbook preferences-general.png toolbar-brushes-gradients.png tool-eraseselection.png dialogs-oilpaint.png index.cache.bz2 toolbar-navigation.png tutorial-select-layer-6.png using-selections-1.png using-selections-6.png tutorial-select-layer-8.png tutorial-quick-starts9.png palettes-controlbox-crop.png tutorial-quick-starts2.png tutorial-quick-starts7.png palettes-colors-gray.png toolbar-brushes-brushshapes-custombrush.png palettes-controlbox-gradient.png tool-colorpicker.png dialogs-separateimage.png using-colorspaces.docbook dialogs-newadjustmentlayer.png dialogs-sobel.png palettes-controlbox-colorpicker.png tool-zoom.png crocusses-oilpaint.png tutorial-quick-starts11.png tool-selectsimilar.png tutorial-starting.docbook dialogs-smalltiles.png preferences-display.png preferences-tablet.png tool-selectcontiguous.png crocusses-gaussianblur.png dialogs-imageproperties.png dialogs-raindrops.png tool-paintwithfilters.png tutorial-select-layer.docbook tool-gradient.png tutorial-select-layer-11.png toolbar-brushes-brushshapes-autobrush.png tool-crop.png tool-polyline.png mainscreen.png tutorial-quick-starts4.png crocusses-meanremoval.png Makefile.am createdocument.png 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -733,20 +742,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita
--	@for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
-+	@for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
-+	for base in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krita/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png credits.docbook commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
-+	for file in preferences-general.png using-selections-4.png commands-palettes.docbook using-selections-6.png tool-eraseselection.png dialogs-convertlayertype.png toolbar-krita.png index.docbook dialogs-shearlayer.png palettes-controlbox-selectcontiguous.png palettes-controlbox-transform.png crocusses-embosshorvert.png introduction.docbook tool-selectcontiguous.png preferences-color.png mainscreen.png commands-dialogs.docbook crocusses-edgeleft.png tutorial-quick-starts2.png crocusses-tiles.png tool-crop.png dialogs-smalltiles.png toolbar-file.png newimage.png dialogs-bumpmap.png tool-brush.png tool-selectrectangular.png dialogs-documentinformation.png palettes-controlbox-colorpicker.png dialogs-convertimagetype.png tool-duplicate.png crocusses.png tool-rectangle.png crocusses-edgeright.png dialogs-layersize.png tutorial-select-layer-11.png installation.docbook tutorial-select-layer-13.png tutorial-quick-starts4.png tool-selectpolygonal.png palettes-layers-scriptsmanager.png palettes-colors-watercolors.png tool-contiguousfill.png commands-menus.docbook toolbar-edit.png tool-star.png tutorial-select-layer-7.png palettes-controlbox-select.png tutorial-quick-starts6.png crocusses-oilpaint.png palettes-colors-palettes.png tutorial-select-layer.docbook tutorial-quick-starts8.png tool-colorpicker.png dialogs-shearimage.png tutorial-starting.docbook toolbar-navigation.png dialogs-customconvolution.png tutorial.docbook dialogs-imagerestoration.png tutorial-select-layer-9.png tutorial-quick-starts11.png crocusses-topedge.png settings.docbook tool-text.png dialogs-separateimage.png dialogs-oilpaint.png palettes-colors-rgb.png createdocument.png using-selections-1.png dialogs-roundcorners.png tool-line.png tool-pan.png crocusses-embossvariable.png scripting.docbook tool-ellipse.png faq.docbook tool-move.png palettes-layers-layers.png tool-selectoutline.png crocusses-sobel.png crocusses-bumpmap.png tool-gradient.png toolbar-brushes-brushshapes-custombrush.png using-selections-3.png crocusses-meanremoval.png tool-selectelliptical.png dialogs-histogram.png dialogs-imagesize.png crocusses-invert.png dialogs-filtersgallery.png dialogs-imageproperties.png crocusses-embossall.png toolbar-brushes-patterns.png tutorial-select-layer-1.png dialogs-colorrange.png tutorial-select-layer-3.png using-selections-5.png tool-paintselection.png dialogs-rotatelayer.png tutorial-select-layer-5.png palettes-controlbox-polygon.png toolbar-brushes-brushshapes-autobrush.png toolbar-brushes-patterns-custompattern.png dialogs-brightnesscontrast.png crocusses-gaussianblur.png palettes-controlbox-overview.png palettes-colors-hsv.png palettes-colors-gray.png dialogs-rotateimage.png using-selections.docbook dialogs-dropshadow.png dialogs-coloradjustment.png crocusses-simplenoise.png crocusses-edgebottom.png palettes-controlbox-histogram.png palettes-controlbox-gradient.png dialogs-newadjustmentlayer.png dialogs-newlayer.png toolbar-brushesandstuff.png crocusses-raindrops.png dialogs-emboss.png credits.docbook tool-paintwithfilters.png tutorial-select-layer-10.png tutorial-quick-starts1.png dialogs-layerproperties.png preferences-tablet.png tutorial-quick-starts3.png tutorial-select-layer-12.png palettes-controlbox-crop.png palettes-controlbox-contiguousfill.png using-layers.docbook palettes-controlbox-star.png commands-toolbars.docbook palettes-controlbox-text.png tutorial-quick-starts5.png crocusses-roundcorners.png tutorial-quick-starts7.png tutorial-quick-starts10.png commands.docbook preferences-grid.png tutorial-quick-starts12.png crocusses-pixelize.png tool-polygon.png toolbar-brushes-brushshapes-predefined.png developers.docbook tutorial-select-layer-sample.png palettes-controlbox-selectsimilar.png crocusses-sharpen.png dialogs-pixelize.png dialogs-sobel.png palettes-controlbox-rectangle.png dialogs-raindrops.png dialogs-addpalette.png tutorial-quick-starts9.png tutorial-quick-starts.docbook tool-transform.png toolbar-brushes-gradients.png toolbar-transformationtools.png tutorial-select-layer-2.png using-filters.docbook tutorial-select-layer-4.png using-colorspaces.docbook palettes-controlbox-brush.png palettes-controlbox-line.png using-selections-2.png tutorial-select-layer-6.png tool-zoom.png tutorial-select-layer-8.png preferences-performance.png dialogs-cubism.png preferences-display.png tool-polyline.png tool-selectsimilar.png palettes-controlbox-paintwithfilters.png preferences-sidebar.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kspread/Makefile.in
 +++ doc/kspread/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63360,70 +19735,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63432,7 +19744,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63446,15 +19758,7 @@
  mostlyclean-libtool:
 --- doc/kugar/Makefile.in
 +++ doc/kugar/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63464,70 +19768,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63536,7 +19777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63550,15 +19791,7 @@
  mostlyclean-libtool:
 --- doc/kword/Makefile.in
 +++ doc/kword/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63568,70 +19801,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63640,7 +19810,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63652,17 +19822,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -732,7 +735,7 @@
+ KDE_DIST=kformapprow.png docstruct.docbook ctab2.png instime.png kparts.docbook bold.png headerfooter.docbook footend.png styles.docbook exul.png listdepth3.png fchardlg5.png alignBlock.png autocompdlg.png rarrow.png tb2.png incindbut.png part-kformula.png expression.png instb.png formatpara.docbook Tut14a.png spell.png bordtb.png mailmerge.docbook fpara5.png Tut7.png rbord.png filefloppy.png repldlg.png formprod.png fpara1.png fileprint.png kbd-focus-ext.png bkgdcolorbut.png part-kspread.png insertfile.docbook formover.png tableprop1.png formsqrt.png basic.png editing.docbook finddlg2.png linkdlg.png fchardlg3.png formsum.png tabstops.docbook frames.docbook intro1.png footcfg1.png formframe5.png mmergesql1.png Makefile.in end.png delentry.png optkb2.png dtab.png insdate.png chcase.png kforminscol.png formframe4.png Tut1.png rowin.png Tut14b.png insgrph2.png insrowdlg.png alignLeft.png opendlg.png styldlg1.png portrait.png supscbut.png opt2.png formabs.png borbutT.png forward.png opt6.png undo.png filenew2.png Tut22.png dtpfmtpg1.png colout.png stkout.png tedittb.png addentry.png docstruct.png kformremrow.png opt1.png fchardlg2.png filetb.png tbord.png thesaurus.png Tut18.png cftb.png exst.png addrecord.png formfrac.png kformremcol.png kformappcol.png mmerge1a.png pageformat.docbook delrecord.png saved1.png savedlg.png undl.png tfcreatebut.png formllind.png mmergeab1.png textstyex.png subscbut.png screen.png opttb.png graphics.docbook formframe2.png ltab2.png chapnumb.docbook select1.png auto4.png Tut19.png bullist.png find.png fpicture.png Tut14.png rtab2.png value.png mbtb.docbook bord.png fchardlg.png joincell.png numtxtbut.png kpart.png wbw.png pntdlg.png alignRight.png forminteg.png pntdlg1.png saved2.png colin.png migrating.docbook footendnotes.docbook editpaste.png beginning.png formframe6.png borbutB.png decindbut.png Tut8.png index.docbook listdepth1.png borbutL.png framestylist.png opt5.png auto3.png chstylebut.png tableprop2.png Tut16.png lists.docbook basics.docbook fileopen.png opt.docbook borbutR.png footcfg2.png chfontbut.png dtab2.png templatecreation.docbook tb4.png Tut2.png Tut21.png mmergekspread1.png auto1.png fchardlg4.png Tut15b.png rowout.png expressions.docbook sum.png lbord.png formatchar.docbook fundimentals.docbook tblsty.png auto2.png savetmpl1.png Tut4.png tts.png insgrph1.png formframe1.png wpfmtpg3.png Tut11b.png fpara2.png opt3.png mmergesql2.png tablestylist.png a11y.docbook chcolorbut.png inscoldlg.png exoffset.png listdepth2.png bbord.png larrow.png Tut3.png storeprint.docbook formulind.png ChooseTempDia.png scan.png ruler.png editcopy.png formcbrac.png columns.docbook landscape.png enumlist.png formframe3.png formtb.png doclinks.docbook formatframes.docbook Tut13a.png mousenav.png formbrac.png kforminsrow.png clearright.png intro2.png bookmarks.docbook saturation.png styleimport.png intro3.png bdsizebut.png formulas.docbook bdselbut.png editcut.png tb3.png mmerge2.png tb1.png tutorial.docbook optkb.png Tut15.png footcfg3.png docvariables.docbook spelldlg.png Tut11a.png paratb.png ctab.png formspecchar.png fpara3.png redo.png wpfmtpg1.png index.cache.bz2 zoom.png edittb.png formurind.png formlrind.png doccomments.docbook rtab.png framers.png wpfmtpg2.png instab1.png ltab.png colorseldlg.png fileprint2.png mmerge1.png fpara4.png chsizebut.png formunder.png viewsize.png ital.png toc.docbook scan2.png Tut13.png picture.png back.png table.docbook finddlg.png bdcolorbut.png formsbrac.png alignCenter.png techinfo.docbook opt4.png formmat.png Makefile.am 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png wbw.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png wbw.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -759,20 +762,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kword
+-	@for base in thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png wbw.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook ; do \
++	@for base in thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png wbw.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kword/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kword/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png wbw.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook ; do \
++	for base in thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png wbw.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kword/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png wbw.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook ; do \
++	for file in thesaurus.png expressions.docbook ctab.png exoffset.png larrow.png doccomments.docbook subscbut.png undl.png undo.png framers.png basic.png formsum.png exst.png landscape.png fchardlg2.png fchardlg3.png fchardlg4.png fchardlg5.png tfcreatebut.png exul.png ChooseTempDia.png rtab.png a11y.docbook bullist.png stkout.png bdsizebut.png linkdlg.png mousenav.png saved1.png saved2.png formatpara.docbook alignBlock.png tabstops.docbook chapnumb.docbook styles.docbook chcolorbut.png tableprop1.png tableprop2.png footendnotes.docbook formframe1.png formframe2.png formframe3.png formframe4.png formframe5.png formframe6.png filefloppy.png bbord.png rowout.png formabs.png formsqrt.png rowin.png savedlg.png tblsty.png scan.png formunder.png kformappcol.png ruler.png alignLeft.png repldlg.png formfrac.png formatframes.docbook cftb.png mmerge1a.png docvariables.docbook dtpfmtpg1.png formover.png tb1.png tb2.png tb3.png tb4.png chcase.png doclinks.docbook mmerge1.png storeprint.docbook mmerge2.png instime.png ctab2.png kformremcol.png migrating.docbook end.png autocompdlg.png Tut1.png Tut2.png Tut3.png Tut4.png select1.png Tut7.png Tut8.png savetmpl1.png textstyex.png optkb2.png zoom.png Tut11a.png Tut11b.png formlrind.png wpfmtpg1.png fileprint2.png editcut.png wpfmtpg2.png wpfmtpg3.png toc.docbook Tut13a.png kparts.docbook Tut14a.png Tut14b.png rbord.png fchardlg.png Tut15b.png find.png columns.docbook scan2.png footend.png Tut13.png listdepth1.png Tut14.png listdepth2.png Tut15.png listdepth3.png Tut16.png Tut18.png Tut19.png ltab.png graphics.docbook Tut21.png Tut22.png joincell.png ltab2.png viewsize.png bdcolorbut.png table.docbook kformapprow.png tedittb.png sum.png alignRight.png forward.png colorseldlg.png saturation.png inscoldlg.png formprod.png kformremrow.png bordtb.png tbord.png clearright.png finddlg.png pntdlg1.png techinfo.docbook mmergekspread1.png formurind.png templatecreation.docbook decindbut.png filetb.png spelldlg.png finddlg2.png insdate.png tts.png pntdlg.png supscbut.png rarrow.png delrecord.png ital.png forminteg.png dtab.png mmergeab1.png formllind.png fpara1.png fpara2.png value.png fpara3.png fpara4.png fpara5.png enumlist.png formspecchar.png expression.png optkb.png pageformat.docbook paratb.png insgrph1.png insgrph2.png auto1.png auto2.png auto3.png auto4.png back.png picture.png formcbrac.png colout.png chstylebut.png alignCenter.png wbw.png headerfooter.docbook basics.docbook kpart.png docstruct.png editcopy.png fileprint.png addentry.png borbutB.png bookmarks.docbook kforminscol.png mmergesql1.png borbutL.png mmergesql2.png styleimport.png frames.docbook borbutR.png opttb.png borbutT.png mailmerge.docbook tablestylist.png intro1.png intro2.png intro3.png portrait.png filenew2.png opt1.png opt2.png opt3.png opt4.png formtb.png opt5.png chsizebut.png opt6.png editpaste.png formulas.docbook incindbut.png styldlg1.png tutorial.docbook editing.docbook formatchar.docbook opendlg.png delentry.png framestylist.png fileopen.png bold.png formbrac.png formulind.png addrecord.png dtab2.png edittb.png lbord.png opt.docbook spell.png beginning.png index.docbook formsbrac.png part-kspread.png bdselbut.png fundimentals.docbook rtab2.png formmat.png bord.png instab1.png numtxtbut.png instb.png insertfile.docbook bkgdcolorbut.png redo.png fpicture.png screen.png footcfg1.png footcfg2.png insrowdlg.png footcfg3.png lists.docbook colin.png kforminsrow.png kbd-focus-ext.png part-kformula.png chfontbut.png mbtb.docbook docstruct.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/Makefile.in
 +++ doc/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63672,70 +19867,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -537,7 +546,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -63744,7 +19876,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +584,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63758,15 +19890,7 @@
  mostlyclean-libtool:
 --- doc/thesaurus/Makefile.in
 +++ doc/thesaurus/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63776,70 +19900,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63848,7 +19909,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63862,15 +19923,7 @@
  mostlyclean-libtool:
 --- example/Makefile.in
 +++ example/Makefile.in
-@@ -174,6 +174,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -311,6 +312,9 @@
+@@ -318,6 +318,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63880,70 +19933,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -369,18 +373,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -435,8 +437,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -459,6 +464,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -540,6 +546,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -556,12 +563,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -624,7 +633,7 @@
+@@ -650,7 +653,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -63952,7 +19942,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -662,9 +671,9 @@
+@@ -688,9 +691,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63966,15 +19956,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/generic_wrapper/Makefile.in
 +++ filters/generic_wrapper/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63984,70 +19966,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64056,7 +19975,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64070,15 +19989,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/ai/Makefile.in
 +++ filters/karbon/ai/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64088,70 +19999,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -618,7 +627,7 @@
+@@ -644,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64160,7 +20008,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +665,9 @@
+@@ -682,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64174,15 +20022,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/applixgraphics/Makefile.in
 +++ filters/karbon/applixgraphics/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64192,70 +20032,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64264,7 +20041,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64278,15 +20055,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/eps/Makefile.in
 +++ filters/karbon/eps/Makefile.in
-@@ -156,6 +156,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -293,6 +294,9 @@
+@@ -300,6 +300,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64296,70 +20065,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,18 +355,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -417,8 +419,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -441,6 +446,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -522,6 +528,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -538,12 +545,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -637,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64368,7 +20074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -675,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64382,15 +20088,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/kontour/Makefile.in
 +++ filters/karbon/kontour/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64400,70 +20098,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64472,7 +20107,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64486,15 +20121,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/Makefile.in
 +++ filters/karbon/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64504,70 +20131,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -64576,7 +20140,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64590,15 +20154,7 @@
  mostlyclean-libtool:
 --- filters/karbon/msod/Makefile.in
 +++ filters/karbon/msod/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64608,70 +20164,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64680,7 +20173,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64694,15 +20187,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/oodraw/Makefile.in
 +++ filters/karbon/oodraw/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64712,70 +20197,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64784,7 +20206,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64798,15 +20220,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/png/Makefile.in
 +++ filters/karbon/png/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64816,70 +20230,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64888,7 +20239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64902,15 +20253,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/svg/Makefile.in
 +++ filters/karbon/svg/Makefile.in
-@@ -151,6 +151,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -288,6 +289,9 @@
+@@ -295,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64920,70 +20263,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,18 +350,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -412,8 +414,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -436,6 +441,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -517,6 +523,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -533,12 +540,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -629,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -64992,7 +20272,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -667,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65006,15 +20286,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/wmf/Makefile.in
 +++ filters/karbon/wmf/Makefile.in
-@@ -152,6 +152,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -289,6 +290,9 @@
+@@ -296,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65024,70 +20296,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,18 +351,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,8 +415,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -437,6 +442,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -518,6 +524,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -534,12 +541,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -65096,7 +20305,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65110,15 +20319,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/xaml/Makefile.in
 +++ filters/karbon/xaml/Makefile.in
-@@ -151,6 +151,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -288,6 +289,9 @@
+@@ -295,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65128,70 +20329,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,18 +350,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -412,8 +414,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -436,6 +441,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -517,6 +523,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -533,12 +540,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -630,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -65200,7 +20338,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -668,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65214,15 +20352,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/karbon/xcf/Makefile.in
 +++ filters/karbon/xcf/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65232,70 +20362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -65304,7 +20371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65318,15 +20385,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/bmp/Makefile.in
 +++ filters/kchart/bmp/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65336,70 +20395,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65408,7 +20404,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65422,15 +20418,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/jpeg/Makefile.in
 +++ filters/kchart/jpeg/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65440,70 +20428,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65512,7 +20437,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65526,15 +20451,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/libimageexport/Makefile.in
 +++ filters/kchart/libimageexport/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65544,70 +20461,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65616,7 +20470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65630,15 +20484,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/Makefile.in
 +++ filters/kchart/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65648,70 +20494,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -65720,7 +20503,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65734,15 +20517,7 @@
  mostlyclean-libtool:
 --- filters/kchart/mng/Makefile.in
 +++ filters/kchart/mng/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65752,70 +20527,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65824,7 +20536,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65838,15 +20550,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/png/Makefile.in
 +++ filters/kchart/png/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65856,70 +20560,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65928,7 +20569,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65942,15 +20583,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/svg/Makefile.in
 +++ filters/kchart/svg/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65960,70 +20593,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -66032,7 +20602,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66046,15 +20616,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/xbm/Makefile.in
 +++ filters/kchart/xbm/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66064,70 +20626,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -66136,7 +20635,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66150,15 +20649,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kchart/xpm/Makefile.in
 +++ filters/kchart/xpm/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66168,70 +20659,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -66240,7 +20668,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66254,15 +20682,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kformula/latex/Makefile.in
 +++ filters/kformula/latex/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66272,70 +20692,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -66344,7 +20701,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66358,15 +20715,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kformula/Makefile.in
 +++ filters/kformula/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66376,70 +20725,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -66448,7 +20734,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66462,15 +20748,7 @@
  mostlyclean-libtool:
 --- filters/kformula/mathml/Makefile.in
 +++ filters/kformula/mathml/Makefile.in
-@@ -153,6 +153,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -290,6 +291,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66480,70 +20758,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,18 +352,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +416,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -438,6 +443,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -519,6 +525,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -535,12 +542,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -592,7 +601,7 @@
+@@ -618,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -66552,7 +20767,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +639,9 @@
+@@ -656,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66566,15 +20781,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kformula/png/Makefile.in
 +++ filters/kformula/png/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66584,70 +20791,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -66656,7 +20800,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66670,15 +20814,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kformula/svg/Makefile.in
 +++ filters/kformula/svg/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66688,70 +20824,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -66760,7 +20833,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66774,15 +20847,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kivio/imageexport/Makefile.in
 +++ filters/kivio/imageexport/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66792,70 +20857,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -66864,7 +20866,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66878,15 +20880,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kivio/Makefile.in
 +++ filters/kivio/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66896,70 +20890,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -66968,7 +20899,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66982,15 +20913,7 @@
  mostlyclean-libtool:
 --- filters/kpresenter/bmp/Makefile.in
 +++ filters/kpresenter/bmp/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67000,70 +20923,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67072,7 +20932,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67086,15 +20946,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/jpeg/Makefile.in
 +++ filters/kpresenter/jpeg/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67104,70 +20956,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67176,7 +20965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67190,15 +20979,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/kword/Makefile.in
 +++ filters/kpresenter/kword/Makefile.in
-@@ -139,6 +139,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -276,6 +277,9 @@
+@@ -283,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67208,70 +20989,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,18 +338,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -400,8 +402,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -424,6 +429,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -505,6 +511,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -521,12 +528,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -570,7 +579,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -67280,7 +20998,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +617,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67294,15 +21012,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/libimageexport/Makefile.in
 +++ filters/kpresenter/libimageexport/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67312,70 +21022,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -581,7 +590,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67384,7 +21031,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +628,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67398,15 +21045,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/magicpoint/Makefile.in
 +++ filters/kpresenter/magicpoint/Makefile.in
-@@ -109,6 +109,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -246,6 +247,9 @@
+@@ -253,6 +253,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67416,70 +21055,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -304,18 +308,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -370,8 +372,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -394,6 +399,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -475,6 +481,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -491,12 +498,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -532,7 +541,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67488,7 +21064,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +579,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67502,15 +21078,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/Makefile.in
 +++ filters/kpresenter/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67520,70 +21088,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -67592,7 +21097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67606,15 +21111,7 @@
  mostlyclean-libtool:
 --- filters/kpresenter/mng/Makefile.in
 +++ filters/kpresenter/mng/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67624,70 +21121,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67696,7 +21130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67710,15 +21144,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/ooimpress/Makefile.in
 +++ filters/kpresenter/ooimpress/Makefile.in
-@@ -153,6 +153,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -290,6 +291,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67728,70 +21154,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,18 +352,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +416,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -438,6 +443,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -519,6 +525,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -535,12 +542,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -67800,7 +21163,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67814,15 +21177,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/png/Makefile.in
 +++ filters/kpresenter/png/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67832,70 +21187,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67904,7 +21196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67918,15 +21210,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/powerpoint/import/Makefile.in
 +++ filters/kpresenter/powerpoint/import/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67936,70 +21220,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -573,7 +582,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -68008,7 +21229,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +620,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68022,15 +21243,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/powerpoint/libppt/Makefile.in
 +++ filters/kpresenter/powerpoint/libppt/Makefile.in
-@@ -131,6 +131,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -268,6 +269,9 @@
+@@ -275,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68040,70 +21253,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,18 +330,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,8 +394,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -416,6 +421,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -497,6 +503,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -513,12 +520,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -68112,7 +21262,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68126,15 +21276,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/kpresenter/powerpoint/Makefile.in
 +++ filters/kpresenter/powerpoint/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68144,70 +21286,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -68216,7 +21295,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68230,15 +21309,7 @@
  mostlyclean-libtool:
 --- filters/kpresenter/svg/Makefile.in
 +++ filters/kpresenter/svg/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68248,70 +21319,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -68320,7 +21328,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68334,15 +21342,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/xbm/Makefile.in
 +++ filters/kpresenter/xbm/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68352,70 +21352,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -68424,7 +21361,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68438,15 +21375,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kpresenter/xpm/Makefile.in
 +++ filters/kpresenter/xpm/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68456,70 +21385,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -68528,7 +21394,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68540,17 +21406,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- filters/krita/gmagick/Makefile.in
++++ filters/krita/gmagick/Makefile.in
+@@ -305,6 +305,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -646,7 +649,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -684,9 +687,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- filters/krita/jpeg/Makefile.in
 +++ filters/krita/jpeg/Makefile.in
-@@ -173,6 +173,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -310,6 +311,9 @@
+@@ -317,6 +317,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68560,70 +21451,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -368,18 +372,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -434,8 +436,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -458,6 +463,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -539,6 +545,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -555,12 +562,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -641,7 +650,7 @@
+@@ -667,7 +670,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -68632,7 +21460,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +688,9 @@
+@@ -705,9 +708,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68646,15 +21474,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/krita/libkisexif/Makefile.in
 +++ filters/krita/libkisexif/Makefile.in
-@@ -126,6 +126,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -263,6 +264,9 @@
+@@ -270,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68664,70 +21484,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -321,18 +325,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,8 +389,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -411,6 +416,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -492,6 +498,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -508,12 +515,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -564,7 +573,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -68736,7 +21493,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +611,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68750,15 +21507,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/krita/magick/Makefile.in
 +++ filters/krita/magick/Makefile.in
-@@ -161,6 +161,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -298,6 +299,9 @@
+@@ -305,6 +305,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68768,70 +21517,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,18 +360,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -422,8 +424,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -446,6 +451,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -527,6 +533,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -543,12 +550,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -646,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -68840,7 +21526,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -684,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68854,15 +21540,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/krita/Makefile.in
 +++ filters/krita/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68872,70 +21550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -541,7 +550,7 @@
+@@ -569,7 +572,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -68944,7 +21559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +588,9 @@
+@@ -607,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68958,15 +21573,7 @@
  mostlyclean-libtool:
 --- filters/krita/openexr/Makefile.in
 +++ filters/krita/openexr/Makefile.in
-@@ -155,6 +155,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -292,6 +293,9 @@
+@@ -299,6 +299,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68976,70 +21583,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,18 +354,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -416,8 +418,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -440,6 +445,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -521,6 +527,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -537,12 +544,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -646,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -69048,7 +21592,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -684,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69060,17 +21604,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- filters/krita/pdf/Makefile.in
++++ filters/krita/pdf/Makefile.in
+@@ -295,6 +295,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -630,7 +633,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -668,9 +671,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- filters/krita/png/Makefile.in
 +++ filters/krita/png/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -303,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69080,70 +21649,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -646,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -69152,7 +21658,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -684,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69166,15 +21672,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/krita/raw/Makefile.in
 +++ filters/krita/raw/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69184,70 +21682,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -69256,7 +21691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69270,15 +21705,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/krita/tiff/Makefile.in
 +++ filters/krita/tiff/Makefile.in
-@@ -176,6 +176,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -313,6 +314,9 @@
+@@ -318,6 +318,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69288,70 +21715,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -371,18 +375,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -437,8 +439,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -461,6 +466,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -542,6 +548,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -558,12 +565,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -653,7 +662,7 @@
+@@ -676,7 +679,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -69360,7 +21724,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +700,9 @@
+@@ -714,9 +717,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69374,15 +21738,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/krita/xcf/Makefile.in
 +++ filters/krita/xcf/Makefile.in
-@@ -162,6 +162,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -299,6 +300,9 @@
+@@ -306,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69392,70 +21748,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -357,18 +361,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -423,8 +425,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -447,6 +452,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -528,6 +534,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -544,12 +551,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -646,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -69464,7 +21757,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -684,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69478,15 +21771,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/applixspread/Makefile.in
 +++ filters/kspread/applixspread/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69496,70 +21781,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -69568,7 +21790,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69582,15 +21804,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/csv/Makefile.in
 +++ filters/kspread/csv/Makefile.in
-@@ -154,6 +154,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -291,6 +292,9 @@
+@@ -298,6 +298,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69600,70 +21814,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,18 +353,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,8 +417,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -439,6 +444,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -520,6 +526,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -536,12 +543,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -69672,7 +21823,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69686,15 +21837,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/dbase/Makefile.in
 +++ filters/kspread/dbase/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69704,70 +21847,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -69776,7 +21856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69790,15 +21870,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/excel/import/Makefile.in
 +++ filters/kspread/excel/import/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69808,70 +21880,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -69880,7 +21889,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69894,15 +21903,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/excel/Makefile.in
 +++ filters/kspread/excel/Makefile.in
-@@ -114,6 +114,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -251,6 +252,9 @@
+@@ -258,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69912,70 +21913,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -309,18 +313,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,8 +377,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -399,6 +404,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -480,6 +486,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -496,12 +503,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -542,7 +551,7 @@
+@@ -568,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -69984,7 +21922,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +589,9 @@
+@@ -606,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69998,15 +21936,7 @@
  mostlyclean-libtool:
 --- filters/kspread/excel/sidewinder/Makefile.in
 +++ filters/kspread/excel/sidewinder/Makefile.in
-@@ -131,6 +131,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -268,6 +269,9 @@
+@@ -275,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70016,70 +21946,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,18 +330,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,8 +394,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -416,6 +421,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -497,6 +503,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -513,12 +520,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70088,7 +21955,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70102,15 +21969,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/kspread/gnumeric/Makefile.in
 +++ filters/kspread/gnumeric/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70120,70 +21979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -70192,7 +21988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70206,15 +22002,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/html/Makefile.in
 +++ filters/kspread/html/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70224,70 +22012,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -70296,7 +22021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70308,17 +22033,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- filters/kspread/kexi/Makefile.in
++++ filters/kspread/kexi/Makefile.in
+@@ -294,6 +294,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -624,7 +627,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -662,9 +665,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- filters/kspread/latex/export/Makefile.in
 +++ filters/kspread/latex/export/Makefile.in
-@@ -157,6 +157,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -294,6 +295,9 @@
+@@ -301,6 +301,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70328,70 +22078,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,18 +356,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,8 +420,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -442,6 +447,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -523,6 +529,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -539,12 +546,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -637,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -70400,7 +22087,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -675,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70414,15 +22101,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/latex/Makefile.in
 +++ filters/kspread/latex/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70432,70 +22111,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -70504,7 +22120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70518,15 +22134,7 @@
  mostlyclean-libtool:
 --- filters/kspread/libkspreadexport/Makefile.in
 +++ filters/kspread/libkspreadexport/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70536,70 +22144,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -70608,7 +22153,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70622,15 +22167,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/Makefile.in
 +++ filters/kspread/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70640,70 +22177,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -70712,7 +22186,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70726,15 +22200,7 @@
  mostlyclean-libtool:
 --- filters/kspread/opencalc/Makefile.in
 +++ filters/kspread/opencalc/Makefile.in
-@@ -157,6 +157,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -294,6 +295,9 @@
+@@ -301,6 +301,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70744,70 +22210,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,18 +356,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,8 +420,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -442,6 +447,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -523,6 +529,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -539,12 +546,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -623,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -70816,7 +22219,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70830,15 +22233,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kspread/qpro/libqpro/Makefile.in
 +++ filters/kspread/qpro/libqpro/Makefile.in
-@@ -113,6 +113,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -250,6 +251,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70848,70 +22243,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,8 +376,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -398,6 +403,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -479,6 +485,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -495,12 +502,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -70920,7 +22252,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70934,15 +22266,7 @@
  mostlyclean-libtool:
 --- filters/kspread/qpro/libqpro/qpro/Makefile.in
 +++ filters/kspread/qpro/libqpro/qpro/Makefile.in
-@@ -101,6 +101,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -238,6 +239,9 @@
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70952,70 +22276,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -296,18 +300,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,8 +364,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -386,6 +391,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -467,6 +473,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -483,12 +490,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -522,7 +531,7 @@
+@@ -548,7 +551,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -71024,7 +22285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -560,9 +569,9 @@
+@@ -586,9 +589,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71038,15 +22299,7 @@
  mostlyclean-libtool:
 --- filters/kspread/qpro/libqpro/src/Makefile.in
 +++ filters/kspread/qpro/libqpro/src/Makefile.in
-@@ -131,6 +131,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -268,6 +269,9 @@
+@@ -275,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71056,70 +22309,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,18 +330,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,8 +394,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -416,6 +421,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -497,6 +503,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -513,12 +520,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -71128,7 +22318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71142,15 +22332,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/kspread/qpro/Makefile.in
 +++ filters/kspread/qpro/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -303,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71160,70 +22342,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -71232,7 +22351,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71246,15 +22365,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kugar/kugarnop/Makefile.in
 +++ filters/kugar/kugarnop/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71264,70 +22375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -574,7 +583,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71336,7 +22384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +621,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71350,15 +22398,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kugar/Makefile.in
 +++ filters/kugar/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71368,70 +22408,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -71440,7 +22417,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71454,15 +22431,7 @@
  mostlyclean-libtool:
 --- filters/kword/abiword/Makefile.in
 +++ filters/kword/abiword/Makefile.in
-@@ -157,6 +157,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -294,6 +295,9 @@
+@@ -301,6 +301,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71472,70 +22441,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,18 +356,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,8 +420,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -442,6 +447,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -523,6 +529,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -539,12 +546,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -71544,7 +22450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71558,15 +22464,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/amipro/Makefile.in
 +++ filters/kword/amipro/Makefile.in
-@@ -154,6 +154,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -291,6 +292,9 @@
+@@ -298,6 +298,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71576,70 +22474,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,18 +353,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,8 +417,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -439,6 +444,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -520,6 +526,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -536,12 +543,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -71648,7 +22483,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71662,15 +22497,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/applixword/Makefile.in
 +++ filters/kword/applixword/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71680,70 +22507,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -71752,7 +22516,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71766,15 +22530,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/ascii/Makefile.in
 +++ filters/kword/ascii/Makefile.in
-@@ -157,6 +157,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -294,6 +295,9 @@
+@@ -301,6 +301,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71784,70 +22540,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,18 +356,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,8 +420,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -442,6 +447,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -523,6 +529,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -539,12 +546,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -602,7 +611,7 @@
+@@ -628,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -71856,7 +22549,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +649,9 @@
+@@ -666,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71870,15 +22563,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/docbook/Makefile.in
 +++ filters/kword/docbook/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71888,70 +22573,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -71960,7 +22582,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71974,15 +22596,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/hancomword/Makefile.in
 +++ filters/kword/hancomword/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71992,70 +22606,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72064,7 +22615,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72078,15 +22629,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/html/export/Makefile.in
 +++ filters/kword/html/export/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72096,70 +22639,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -72168,7 +22648,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72182,15 +22662,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/html/import/Makefile.in
 +++ filters/kword/html/import/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72200,70 +22672,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72272,7 +22681,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72286,15 +22695,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/html/Makefile.in
 +++ filters/kword/html/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72304,70 +22705,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -72376,7 +22714,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72390,15 +22728,7 @@
  mostlyclean-libtool:
 --- filters/kword/kword1.3/import/Makefile.in
 +++ filters/kword/kword1.3/import/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72408,70 +22738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72480,7 +22747,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72494,15 +22761,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/kword1.3/Makefile.in
 +++ filters/kword/kword1.3/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72512,70 +22771,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -72584,7 +22780,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72598,15 +22794,7 @@
  mostlyclean-libtool:
 --- filters/kword/latex/export/Makefile.in
 +++ filters/kword/latex/export/Makefile.in
-@@ -157,6 +157,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -294,6 +295,9 @@
+@@ -301,6 +301,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72616,70 +22804,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,18 +356,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,8 +420,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -442,6 +447,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -523,6 +529,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -539,12 +546,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -637,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -72688,7 +22813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -675,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72702,15 +22827,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/latex/import/generator/Makefile.in
 +++ filters/kword/latex/import/generator/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72720,70 +22837,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -576,7 +585,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -72792,7 +22846,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +623,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72806,15 +22860,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/latex/import/Makefile.in
 +++ filters/kword/latex/import/Makefile.in
-@@ -162,6 +162,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -299,6 +300,9 @@
+@@ -306,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72824,70 +22870,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -357,18 +361,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -423,8 +425,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -447,6 +452,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -528,6 +534,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -544,12 +551,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -636,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -72896,7 +22879,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -674,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72910,15 +22893,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/latex/import/parser/Makefile.in
 +++ filters/kword/latex/import/parser/Makefile.in
-@@ -153,6 +153,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -290,6 +291,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72928,70 +22903,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,18 +352,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +416,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -438,6 +443,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -519,6 +525,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -535,12 +542,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -73000,7 +22912,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73014,15 +22926,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/latex/Makefile.in
 +++ filters/kword/latex/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73032,70 +22936,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -73104,7 +22945,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73118,15 +22959,7 @@
  mostlyclean-libtool:
 --- filters/kword/libexport/Makefile.in
 +++ filters/kword/libexport/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73136,70 +22969,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -73208,7 +22978,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73222,15 +22992,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/Makefile.in
 +++ filters/kword/Makefile.in
-@@ -114,6 +114,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -251,6 +252,9 @@
+@@ -258,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73240,70 +23002,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -309,18 +313,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,8 +377,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -399,6 +404,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -480,6 +486,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -496,12 +503,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -539,7 +548,7 @@
+@@ -565,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -73312,7 +23011,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +586,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73326,15 +23025,7 @@
  mostlyclean-libtool:
 --- filters/kword/msword/Makefile.in
 +++ filters/kword/msword/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73344,70 +23035,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -73416,7 +23044,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73430,15 +23058,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/mswrite/Makefile.in
 +++ filters/kword/mswrite/Makefile.in
-@@ -166,6 +166,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -303,6 +304,9 @@
+@@ -310,6 +310,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73448,70 +23068,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,18 +365,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -427,8 +429,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -451,6 +456,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -532,6 +538,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -548,12 +555,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -618,7 +627,7 @@
+@@ -644,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -73520,7 +23077,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +665,9 @@
+@@ -682,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73534,15 +23091,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/oowriter/Makefile.in
 +++ filters/kword/oowriter/Makefile.in
-@@ -161,6 +161,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -298,6 +299,9 @@
+@@ -305,6 +305,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73552,70 +23101,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,18 +360,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -422,8 +424,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -446,6 +451,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -527,6 +533,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -543,12 +550,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -630,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -73624,7 +23110,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -668,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73638,15 +23124,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/palmdoc/Makefile.in
 +++ filters/kword/palmdoc/Makefile.in
-@@ -158,6 +158,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -295,6 +296,9 @@
+@@ -302,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73656,70 +23134,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,18 +357,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,8 +421,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -443,6 +448,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -524,6 +530,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -540,12 +547,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -623,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -73728,7 +23143,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73742,15 +23157,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/pdf/Makefile.in
 +++ filters/kword/pdf/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -303,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73760,70 +23167,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -73832,7 +23176,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73846,15 +23190,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/pdf/xpdf/goo/Makefile.in
 +++ filters/kword/pdf/xpdf/goo/Makefile.in
-@@ -139,6 +139,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -276,6 +277,9 @@
+@@ -283,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73864,70 +23200,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,18 +338,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -400,8 +402,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -424,6 +429,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -505,6 +511,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -521,12 +528,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -565,7 +574,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -73936,7 +23209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -603,9 +612,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73950,15 +23223,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/kword/pdf/xpdf/Makefile.in
 +++ filters/kword/pdf/xpdf/Makefile.in
-@@ -113,6 +113,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -250,6 +251,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73968,70 +23233,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,8 +376,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -398,6 +403,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -479,6 +485,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -495,12 +502,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -74040,7 +23242,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74054,15 +23256,7 @@
  mostlyclean-libtool:
 --- filters/kword/pdf/xpdf/xpdf/Makefile.in
 +++ filters/kword/pdf/xpdf/xpdf/Makefile.in
-@@ -140,6 +140,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -277,6 +278,9 @@
+@@ -284,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74072,70 +23266,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,18 +339,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,8 +403,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -425,6 +430,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -506,6 +512,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -522,12 +529,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -573,7 +582,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -74144,7 +23275,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +620,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74158,15 +23289,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/kword/rtf/export/Makefile.in
 +++ filters/kword/rtf/export/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74176,70 +23299,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -74248,7 +23308,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74262,15 +23322,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/rtf/import/Makefile.in
 +++ filters/kword/rtf/import/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74280,70 +23332,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -74352,7 +23341,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74366,15 +23355,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/rtf/Makefile.in
 +++ filters/kword/rtf/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74384,70 +23365,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -74456,7 +23374,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74470,15 +23388,7 @@
  mostlyclean-libtool:
 --- filters/kword/starwriter/Makefile.in
 +++ filters/kword/starwriter/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74488,70 +23398,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -74560,7 +23407,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74574,15 +23421,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/wml/Makefile.in
 +++ filters/kword/wml/Makefile.in
-@@ -153,6 +153,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -290,6 +291,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74592,70 +23431,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,18 +352,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +416,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -438,6 +443,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -519,6 +525,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -535,12 +542,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -592,7 +601,7 @@
+@@ -618,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -74664,7 +23440,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +639,9 @@
+@@ -656,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74678,15 +23454,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/wordperfect/export/Makefile.in
 +++ filters/kword/wordperfect/export/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74696,70 +23464,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -74768,7 +23473,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74782,15 +23487,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/wordperfect/import/Makefile.in
 +++ filters/kword/wordperfect/import/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74800,70 +23497,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cxx .lo .o .obj
@@ -74872,7 +23506,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74886,15 +23520,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/kword/wordperfect/Makefile.in
 +++ filters/kword/wordperfect/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74904,70 +23530,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -74976,7 +23539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74990,15 +23553,7 @@
  mostlyclean-libtool:
 --- filters/libdialogfilter/Makefile.in
 +++ filters/libdialogfilter/Makefile.in
-@@ -126,6 +126,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -263,6 +264,9 @@
+@@ -270,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75008,70 +23563,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -321,18 +325,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,8 +389,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -411,6 +416,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -492,6 +498,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -508,12 +515,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -551,7 +560,7 @@
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -75080,7 +23572,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +598,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75094,15 +23586,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/liboofilter/Makefile.in
 +++ filters/liboofilter/Makefile.in
-@@ -129,6 +129,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -266,6 +267,9 @@
+@@ -273,6 +273,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75112,70 +23596,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -324,18 +328,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -390,8 +392,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -414,6 +419,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -495,6 +501,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -511,12 +518,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -553,7 +562,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -75184,7 +23605,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +600,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75198,15 +23619,7 @@
  clean-noinstLTLIBRARIES:
 --- filters/Makefile.in
 +++ filters/Makefile.in
-@@ -115,6 +115,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -252,6 +253,9 @@
+@@ -259,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75216,70 +23629,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -310,18 +314,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,8 +378,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -400,6 +405,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -481,6 +487,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -497,12 +504,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -546,7 +555,7 @@
+@@ -572,7 +575,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -75288,7 +23638,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +593,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75300,17 +23650,108 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- filters/olefilters/lib/Makefile.in
++++ filters/olefilters/lib/Makefile.in
+@@ -280,6 +280,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -593,7 +596,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -631,9 +634,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+--- filters/olefilters/Makefile.in
++++ filters/olefilters/Makefile.in
+@@ -298,6 +298,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -619,7 +622,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -657,9 +660,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- filters/olefilters/powerpoint97/Makefile.in
++++ filters/olefilters/powerpoint97/Makefile.in
+@@ -290,6 +290,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -603,7 +606,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -641,9 +644,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
 --- filters/xsltfilter/export/Makefile.in
 +++ filters/xsltfilter/export/Makefile.in
-@@ -162,6 +162,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -299,6 +300,9 @@
+@@ -306,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75320,70 +23761,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -357,18 +361,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -423,8 +425,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -447,6 +452,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -528,6 +534,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -544,12 +551,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -631,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -75392,7 +23770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -669,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75406,15 +23784,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/xsltfilter/export/xsl/kword/Makefile.in
 +++ filters/xsltfilter/export/xsl/kword/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75424,70 +23794,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -75496,7 +23803,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75510,15 +23817,7 @@
  mostlyclean-libtool:
 --- filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
 +++ filters/xsltfilter/export/xsl/kword/xslfo/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75528,70 +23827,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -75600,7 +23836,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75614,15 +23850,7 @@
  mostlyclean-libtool:
 --- filters/xsltfilter/export/xsl/Makefile.in
 +++ filters/xsltfilter/export/xsl/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75632,70 +23860,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -75704,7 +23869,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75718,15 +23883,7 @@
  mostlyclean-libtool:
 --- filters/xsltfilter/import/Makefile.in
 +++ filters/xsltfilter/import/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75736,70 +23893,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -75808,7 +23902,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75822,15 +23916,7 @@
  	@$(NORMAL_INSTALL)
 --- filters/xsltfilter/Makefile.in
 +++ filters/xsltfilter/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75840,70 +23926,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -75912,7 +23935,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75926,15 +23949,7 @@
  mostlyclean-libtool:
 --- interfaces/Makefile.in
 +++ interfaces/Makefile.in
-@@ -139,6 +139,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -276,6 +277,9 @@
+@@ -283,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75944,70 +23959,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,18 +338,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -400,8 +402,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -424,6 +429,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -505,6 +511,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -521,12 +528,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -569,7 +578,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -76016,7 +23968,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +616,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76030,15 +23982,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/commands/Makefile.in
 +++ karbon/commands/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76048,70 +23992,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -617,7 +626,7 @@
+@@ -643,7 +646,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -76120,7 +24001,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +664,9 @@
+@@ -681,9 +684,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76134,15 +24015,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/core/Makefile.in
 +++ karbon/core/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76152,70 +24025,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -671,7 +680,7 @@
+@@ -697,7 +700,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -76224,7 +24034,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -709,9 +718,9 @@
+@@ -735,9 +738,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76238,15 +24048,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/data/Makefile.in
 +++ karbon/data/Makefile.in
-@@ -113,6 +113,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -250,6 +251,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76256,70 +24058,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,8 +376,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -398,6 +403,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -479,6 +485,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -495,12 +502,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -541,7 +550,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76328,7 +24067,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +588,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76342,15 +24081,7 @@
  mostlyclean-libtool:
 --- karbon/dialogs/Makefile.in
 +++ karbon/dialogs/Makefile.in
-@@ -134,6 +134,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -271,6 +272,9 @@
+@@ -278,6 +278,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76360,70 +24091,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,18 +333,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -395,8 +397,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -419,6 +424,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -500,6 +506,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -516,12 +523,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -76432,7 +24100,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76446,15 +24114,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/dockers/Makefile.in
 +++ karbon/dockers/Makefile.in
-@@ -136,6 +136,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -273,6 +274,9 @@
+@@ -280,6 +280,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76464,70 +24124,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -331,18 +335,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -397,8 +399,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -421,6 +426,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -502,6 +508,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -518,12 +525,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -76536,7 +24133,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76550,15 +24147,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/Makefile.in
 +++ karbon/Makefile.in
-@@ -207,6 +207,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -344,6 +345,9 @@
+@@ -351,6 +351,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76568,70 +24157,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,18 +406,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -468,8 +470,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -492,6 +497,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -573,6 +579,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -589,12 +596,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -641,9 +650,9 @@
+@@ -667,9 +670,9 @@
  #>- libkarboncommon_la_SOURCES = karbon_factory.cc 	karbon_resourceserver.cc 	karbon_part.cc 	karbon_part_iface.cc 	karbon_part_iface.skel 	karbon_view.cc 	karbon_view_iface.cc 	karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc	vtoolcontroller.cc vtool.cc
  #>+ 1
  libkarboncommon_la_SOURCES=karbon_factory.cc 	karbon_resourceserver.cc 	karbon_part.cc 	karbon_part_iface.cc 	 	karbon_view.cc 	karbon_view_iface.cc 	 karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc	vtoolcontroller.cc vtool.cc karbon_part_iface_skel.cc karbon_view_iface_skel.cc
@@ -76643,7 +24169,7 @@
  libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
  	dockers/libkarbondockers.la \
  	widgets/libkarbonwidgets.la \
-@@ -684,7 +693,7 @@
+@@ -710,7 +713,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -76652,7 +24178,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -722,9 +731,9 @@
+@@ -748,9 +751,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76666,15 +24192,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/pics/Makefile.in
 +++ karbon/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76684,70 +24202,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -519,7 +528,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76756,7 +24211,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -557,9 +566,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76770,15 +24225,7 @@
  mostlyclean-libtool:
 --- karbon/plugins/flattenpath/Makefile.in
 +++ karbon/plugins/flattenpath/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76788,70 +24235,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -76860,7 +24244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76874,15 +24258,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/plugins/imagetool/Makefile.in
 +++ karbon/plugins/imagetool/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76892,70 +24268,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -576,7 +585,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -76964,7 +24277,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +623,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76978,15 +24291,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/plugins/insertknots/Makefile.in
 +++ karbon/plugins/insertknots/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76996,70 +24301,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -77068,7 +24310,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77082,15 +24324,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/plugins/Makefile.in
 +++ karbon/plugins/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77100,70 +24334,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -77172,7 +24343,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77186,15 +24357,7 @@
  mostlyclean-libtool:
 --- karbon/plugins/roundcorners/Makefile.in
 +++ karbon/plugins/roundcorners/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77204,70 +24367,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -77276,7 +24376,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77290,15 +24390,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/plugins/shadoweffect/Makefile.in
 +++ karbon/plugins/shadoweffect/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77308,70 +24400,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -77380,7 +24409,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77394,15 +24423,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/plugins/whirlpinch/Makefile.in
 +++ karbon/plugins/whirlpinch/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77412,70 +24433,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -77484,7 +24442,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77498,15 +24456,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/plugins/zoomtool/Makefile.in
 +++ karbon/plugins/zoomtool/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77516,70 +24466,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -574,7 +583,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -77588,7 +24475,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +621,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77602,15 +24489,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/render/Makefile.in
 +++ karbon/render/Makefile.in
-@@ -158,6 +158,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -295,6 +296,9 @@
+@@ -302,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77620,70 +24499,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,18 +357,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,8 +421,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -443,6 +448,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -524,6 +530,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -540,12 +547,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -612,7 +621,7 @@
+@@ -638,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -77692,7 +24508,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +659,9 @@
+@@ -676,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77706,15 +24522,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/render/xrgbrender/Makefile.in
 +++ karbon/render/xrgbrender/Makefile.in
-@@ -123,6 +123,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -260,6 +261,9 @@
+@@ -267,6 +267,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77724,70 +24532,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -318,18 +322,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,8 +386,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -408,6 +413,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -489,6 +495,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -505,12 +512,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -547,7 +556,7 @@
+@@ -573,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -77796,7 +24541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +594,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77810,15 +24555,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/shapes/Makefile.in
 +++ karbon/shapes/Makefile.in
-@@ -134,6 +134,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -271,6 +272,9 @@
+@@ -278,6 +278,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77828,70 +24565,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,18 +333,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -395,8 +397,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -419,6 +424,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -500,6 +506,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -516,12 +523,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -77900,7 +24574,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77914,15 +24588,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/templates/basic/Makefile.in
 +++ karbon/templates/basic/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77932,70 +24598,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -78004,7 +24607,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78018,15 +24621,7 @@
  mostlyclean-libtool:
 --- karbon/templates/Makefile.in
 +++ karbon/templates/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78036,70 +24631,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -78108,7 +24640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78122,15 +24654,7 @@
  mostlyclean-libtool:
 --- karbon/tools/Makefile.in
 +++ karbon/tools/Makefile.in
-@@ -158,6 +158,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -295,6 +296,9 @@
+@@ -302,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78140,70 +24664,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,18 +357,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,8 +421,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -443,6 +448,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -524,6 +530,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -540,12 +547,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -640,7 +649,7 @@
+@@ -666,7 +669,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -78212,7 +24673,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -678,9 +687,9 @@
+@@ -704,9 +707,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78226,15 +24687,7 @@
  	@$(NORMAL_INSTALL)
 --- karbon/visitors/Makefile.in
 +++ karbon/visitors/Makefile.in
-@@ -134,6 +134,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -271,6 +272,9 @@
+@@ -278,6 +278,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78244,70 +24697,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,18 +333,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -395,8 +397,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -419,6 +424,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -500,6 +506,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -516,12 +523,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -581,7 +590,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -78316,7 +24706,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +628,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78330,15 +24720,7 @@
  clean-noinstLTLIBRARIES:
 --- karbon/widgets/Makefile.in
 +++ karbon/widgets/Makefile.in
-@@ -140,6 +140,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -277,6 +278,9 @@
+@@ -284,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78348,70 +24730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,18 +339,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,8 +403,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -425,6 +430,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -506,6 +512,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -522,12 +529,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -637,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -78420,7 +24739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -675,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78434,15 +24753,7 @@
  clean-noinstLTLIBRARIES:
 --- kchart/kdchart/Makefile.in
 +++ kchart/kdchart/Makefile.in
-@@ -167,6 +167,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -304,6 +305,9 @@
+@@ -311,6 +311,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78452,70 +24763,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -362,18 +366,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -428,8 +430,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -452,6 +457,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -533,6 +539,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -549,12 +556,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -669,7 +678,7 @@
+@@ -695,7 +698,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78524,7 +24772,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -707,9 +716,9 @@
+@@ -733,9 +736,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78538,15 +24786,7 @@
  	@$(NORMAL_INSTALL)
 --- kchart/Makefile.in
 +++ kchart/Makefile.in
-@@ -230,6 +230,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -367,6 +368,9 @@
+@@ -374,6 +374,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78556,70 +24796,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,18 +429,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -491,8 +493,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -515,6 +520,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -596,6 +602,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -612,12 +619,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -768,7 +777,7 @@
+@@ -794,7 +797,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -78628,7 +24805,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -806,9 +815,9 @@
+@@ -832,9 +835,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78642,15 +24819,7 @@
  	@$(NORMAL_INSTALL)
 --- kchart/pics/Makefile.in
 +++ kchart/pics/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78660,70 +24829,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -537,7 +546,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -78732,7 +24838,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +584,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78746,15 +24852,7 @@
  mostlyclean-libtool:
 --- kchart/templates/Makefile.in
 +++ kchart/templates/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78764,70 +24862,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -78836,7 +24871,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78850,15 +24885,7 @@
  mostlyclean-libtool:
 --- kchart/toolbar/crystalsvg/Makefile.in
 +++ kchart/toolbar/crystalsvg/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78868,70 +24895,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -78940,7 +24904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78954,15 +24918,7 @@
  mostlyclean-libtool:
 --- kchart/toolbar/locolor/Makefile.in
 +++ kchart/toolbar/locolor/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78972,70 +24928,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -79044,7 +24937,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79058,15 +24951,7 @@
  mostlyclean-libtool:
 --- kchart/toolbar/Makefile.in
 +++ kchart/toolbar/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79076,70 +24961,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -79148,7 +24970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79162,15 +24984,7 @@
  mostlyclean-libtool:
 --- kdgantt/Makefile.in
 +++ kdgantt/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79180,70 +24994,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -622,7 +631,7 @@
+@@ -648,7 +651,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -79252,7 +25003,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +669,9 @@
+@@ -686,9 +689,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79266,15 +25017,7 @@
  clean-noinstLTLIBRARIES:
 --- kexi/3rdparty/kexisql/Makefile.in
 +++ kexi/3rdparty/kexisql/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79284,70 +25027,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -79356,7 +25036,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79370,15 +25050,7 @@
  mostlyclean-libtool:
 --- kexi/3rdparty/kexisql/src/Makefile.in
 +++ kexi/3rdparty/kexisql/src/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79388,70 +25060,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -79460,7 +25069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79474,15 +25083,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/3rdparty/kexisql/tool/Makefile.in
 +++ kexi/3rdparty/kexisql/tool/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79492,70 +25093,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -516,7 +525,7 @@
+@@ -542,7 +545,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -79564,7 +25102,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +563,9 @@
+@@ -580,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79578,15 +25116,7 @@
  mostlyclean-libtool:
 --- kexi/3rdparty/kexisql3/Makefile.in
 +++ kexi/3rdparty/kexisql3/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79596,70 +25126,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -79668,7 +25135,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79682,15 +25149,7 @@
  mostlyclean-libtool:
 --- kexi/3rdparty/kexisql3/src/Makefile.in
 +++ kexi/3rdparty/kexisql3/src/Makefile.in
-@@ -152,6 +152,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -289,6 +290,9 @@
+@@ -298,6 +298,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79700,70 +25159,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,18 +351,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,8 +415,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -437,6 +442,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -518,6 +524,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -534,12 +541,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -635,7 +644,7 @@
+@@ -670,7 +673,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -79772,7 +25168,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -673,9 +682,9 @@
+@@ -708,9 +711,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79786,15 +25182,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/3rdparty/kolibs/Makefile.in
 +++ kexi/3rdparty/kolibs/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79804,70 +25192,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -649,7 +652,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -79876,7 +25201,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -687,9 +690,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79890,15 +25215,7 @@
  clean-noinstLTLIBRARIES:
 --- kexi/3rdparty/Makefile.in
 +++ kexi/3rdparty/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79908,70 +25225,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -79980,7 +25234,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79994,15 +25248,7 @@
  mostlyclean-libtool:
 --- kexi/3rdparty/uuid/Makefile.in
 +++ kexi/3rdparty/uuid/Makefile.in
-@@ -136,6 +136,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -273,6 +274,9 @@
+@@ -280,6 +280,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80012,70 +25258,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -331,18 +335,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -397,8 +399,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -421,6 +426,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -502,6 +508,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -518,12 +525,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -80084,7 +25267,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80098,15 +25281,7 @@
  clean-noinstLTLIBRARIES:
 --- kexi/core/Makefile.in
 +++ kexi/core/Makefile.in
-@@ -177,6 +177,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -314,6 +315,9 @@
+@@ -323,6 +323,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80116,70 +25291,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -372,18 +376,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -438,8 +440,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -462,6 +467,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -543,6 +549,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -559,12 +566,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -650,7 +659,7 @@
+@@ -682,7 +685,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80188,7 +25300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -688,9 +697,9 @@
+@@ -720,9 +723,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80202,15 +25314,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/data/kde34compat/Makefile.in
 +++ kexi/data/kde34compat/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80220,70 +25324,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -536,7 +545,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -80292,7 +25333,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +583,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80306,15 +25347,7 @@
  mostlyclean-libtool:
 --- kexi/data/Makefile.in
 +++ kexi/data/Makefile.in
-@@ -130,6 +130,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -267,6 +268,9 @@
+@@ -274,6 +274,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80324,70 +25357,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -325,18 +329,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,8 +393,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -415,6 +420,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -496,6 +502,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -512,12 +519,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -637,7 +640,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -80396,7 +25366,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -675,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80410,15 +25380,7 @@
  mostlyclean-libtool:
 --- kexi/examples/Makefile.in
 +++ kexi/examples/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80428,70 +25390,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -516,7 +525,7 @@
+@@ -542,7 +545,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -80500,7 +25399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +563,9 @@
+@@ -580,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80514,15 +25413,7 @@
  mostlyclean-libtool:
 --- kexi/formeditor/factories/Makefile.in
 +++ kexi/formeditor/factories/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80532,70 +25423,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -629,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80604,7 +25432,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -667,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80618,15 +25446,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/formeditor/kdevelop_plugin/Makefile.in
 +++ kexi/formeditor/kdevelop_plugin/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80636,70 +25456,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -627,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80708,7 +25465,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -665,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80722,15 +25479,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/formeditor/Makefile.in
 +++ kexi/formeditor/Makefile.in
-@@ -171,6 +171,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -308,6 +309,9 @@
+@@ -317,6 +317,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80740,70 +25489,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,18 +370,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -432,8 +434,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -456,6 +461,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -537,6 +543,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -553,12 +560,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -636,7 +645,7 @@
+@@ -667,7 +670,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80812,7 +25498,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +683,9 @@
+@@ -705,9 +708,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80826,15 +25512,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/formeditor/scripting/Makefile.in
 +++ kexi/formeditor/scripting/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80844,70 +25522,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80916,7 +25531,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80930,15 +25545,7 @@
  clean-noinstLTLIBRARIES:
 --- kexi/formeditor/test/Makefile.in
 +++ kexi/formeditor/test/Makefile.in
-@@ -161,6 +161,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -298,6 +299,9 @@
+@@ -305,6 +305,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80948,70 +25555,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,18 +360,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -422,8 +424,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -446,6 +451,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -527,6 +533,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -543,12 +550,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -628,7 +637,7 @@
+@@ -657,7 +660,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81020,7 +25564,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +675,9 @@
+@@ -695,9 +698,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81034,15 +25578,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexidb/drivers/Makefile.in
 +++ kexi/kexidb/drivers/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81052,70 +25588,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -81124,7 +25597,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81138,15 +25611,7 @@
  mostlyclean-libtool:
 --- kexi/kexidb/drivers/mySQL/Makefile.in
 +++ kexi/kexidb/drivers/mySQL/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81156,70 +25621,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -609,7 +618,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81228,7 +25630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +656,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81242,15 +25644,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexidb/drivers/odbc/Makefile.in
 +++ kexi/kexidb/drivers/odbc/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81260,70 +25654,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81332,7 +25663,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81346,15 +25677,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexidb/drivers/pqxx/Makefile.in
 +++ kexi/kexidb/drivers/pqxx/Makefile.in
-@@ -151,6 +151,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -288,6 +289,9 @@
+@@ -295,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81364,70 +25687,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,18 +350,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -412,8 +414,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -436,6 +441,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -517,6 +523,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -533,12 +540,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -633,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81436,7 +25696,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -671,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81450,15 +25710,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexidb/drivers/sqlite/Makefile.in
 +++ kexi/kexidb/drivers/sqlite/Makefile.in
-@@ -152,6 +152,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -289,6 +290,9 @@
+@@ -298,6 +298,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81468,70 +25720,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,18 +351,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,8 +415,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -437,6 +442,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -518,6 +524,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -534,12 +541,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -637,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81540,7 +25729,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -675,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81554,15 +25743,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexidb/drivers/sqlite2/Makefile.in
 +++ kexi/kexidb/drivers/sqlite2/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -296,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81572,70 +25753,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -607,7 +616,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81644,7 +25762,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +654,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81658,15 +25776,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexidb/Makefile.in
 +++ kexi/kexidb/Makefile.in
-@@ -176,6 +176,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -313,6 +314,9 @@
+@@ -322,6 +322,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81676,70 +25786,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -371,18 +375,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -437,8 +439,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -461,6 +466,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -542,6 +548,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -558,12 +565,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -639,7 +648,7 @@
+@@ -670,7 +673,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81748,7 +25795,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +686,9 @@
+@@ -708,9 +711,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81762,15 +25809,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexidb/parser/Makefile.in
 +++ kexi/kexidb/parser/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81780,70 +25819,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81852,7 +25828,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81866,15 +25842,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/kexiutils/Makefile.in
 +++ kexi/kexiutils/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81884,70 +25852,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -630,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81956,7 +25861,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -668,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81970,15 +25875,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/main/Makefile.in
 +++ kexi/main/Makefile.in
-@@ -170,6 +170,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -307,6 +308,9 @@
+@@ -314,6 +314,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81988,70 +25885,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -365,18 +369,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -431,8 +433,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -455,6 +460,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -536,6 +542,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -552,12 +559,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -641,7 +650,7 @@
+@@ -670,7 +673,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82060,7 +25894,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +688,9 @@
+@@ -708,9 +711,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82074,15 +25908,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/main/printing/Makefile.in
 +++ kexi/main/printing/Makefile.in
-@@ -153,6 +153,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -290,6 +291,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82092,70 +25918,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,18 +352,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +416,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -438,6 +443,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -519,6 +525,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -535,12 +542,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -621,7 +630,7 @@
+@@ -650,7 +653,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82164,7 +25927,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +668,9 @@
+@@ -688,9 +691,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82178,15 +25941,7 @@
  clean-noinstLTLIBRARIES:
 --- kexi/main/startup/Makefile.in
 +++ kexi/main/startup/Makefile.in
-@@ -155,6 +155,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -292,6 +293,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82196,70 +25951,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,18 +354,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -416,8 +418,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -440,6 +445,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -521,6 +527,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -537,12 +544,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -642,7 +651,7 @@
+@@ -669,7 +672,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82268,7 +25960,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -680,9 +689,9 @@
+@@ -707,9 +710,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82282,15 +25974,7 @@
  clean-noinstLTLIBRARIES:
 --- kexi/Makefile.in
 +++ kexi/Makefile.in
-@@ -170,6 +170,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -307,6 +308,9 @@
+@@ -314,6 +314,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82300,70 +25984,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -365,18 +369,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -431,8 +433,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -455,6 +460,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -536,6 +542,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -552,12 +559,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -651,7 +660,7 @@
+@@ -680,7 +683,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82372,7 +25993,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -689,9 +698,9 @@
+@@ -718,9 +721,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82386,15 +26007,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/migration/Makefile.in
 +++ kexi/migration/Makefile.in
-@@ -179,6 +179,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -316,6 +317,9 @@
+@@ -323,6 +323,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82404,70 +26017,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -374,18 +378,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -440,8 +442,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -464,6 +469,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -545,6 +551,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -561,12 +568,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -653,7 +662,7 @@
+@@ -683,7 +686,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82476,7 +26026,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +700,9 @@
+@@ -721,9 +724,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82490,15 +26040,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/migration/mysql/Makefile.in
 +++ kexi/migration/mysql/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82508,70 +26050,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82580,7 +26059,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82594,15 +26073,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/migration/pqxx/Makefile.in
 +++ kexi/migration/pqxx/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82612,70 +26083,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -592,7 +601,7 @@
+@@ -621,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82684,7 +26092,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +639,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82698,15 +26106,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/migration/txt/Makefile.in
 +++ kexi/migration/txt/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82716,70 +26116,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82788,7 +26125,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82802,15 +26139,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/pics/Makefile.in
 +++ kexi/pics/Makefile.in
-@@ -107,6 +107,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -244,6 +245,9 @@
+@@ -251,6 +251,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82820,70 +26149,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -302,18 +306,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,8 +370,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -392,6 +397,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -473,6 +479,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -489,12 +496,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -567,7 +576,7 @@
+@@ -597,7 +600,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -82892,7 +26158,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +614,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82904,45 +26170,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -880,12 +889,12 @@
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-pixmaplabel.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/pixmaplabel.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-frame.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/frame.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-aoshortest.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aoshortest.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-form_action.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/form_action.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-lineedit.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/lineedit.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-aonarrowest.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aonarrowest.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-table_newobj.png $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/table_newobj.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-lineedit.png $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/lineedit.png
--	$(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-form_action.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/form_action.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-spring.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/spring.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-navigator_first.png $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/navigator_first.png
-@@ -1045,12 +1054,12 @@
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/pixmaplabel.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/frame.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aoshortest.png
-+	-rm -f $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/form_action.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/lineedit.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/aonarrowest.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/table_newobj.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/lineedit.png
--	-rm -f $(DESTDIR)$(icondir)/crystalsvg/48x48/actions/key.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/form_action.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/spring.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/16x16/actions/navigator_first.png
 --- kexi/plugins/forms/Makefile.in
 +++ kexi/plugins/forms/Makefile.in
-@@ -201,6 +201,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -338,6 +339,9 @@
+@@ -345,6 +345,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82952,70 +26182,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,18 +400,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -462,8 +464,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -486,6 +491,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -567,6 +573,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -583,12 +590,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -689,7 +698,7 @@
+@@ -718,7 +721,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83024,7 +26191,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -727,9 +736,9 @@
+@@ -756,9 +759,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83038,15 +26205,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/forms/widgets/Makefile.in
 +++ kexi/plugins/forms/widgets/Makefile.in
-@@ -155,6 +155,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -292,6 +293,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83056,70 +26215,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,18 +354,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -416,8 +418,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -440,6 +445,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -521,6 +527,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -537,12 +544,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -640,7 +643,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83128,7 +26224,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -678,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83142,15 +26238,7 @@
  clean-noinstLTLIBRARIES:
 --- kexi/plugins/importexport/csv/Makefile.in
 +++ kexi/plugins/importexport/csv/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83160,70 +26248,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -630,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83232,7 +26257,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -668,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83246,15 +26271,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/importexport/Makefile.in
 +++ kexi/plugins/importexport/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83264,70 +26281,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -83336,7 +26290,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83348,17 +26302,174 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- kexi/plugins/macros/kexiactions/Makefile.in
++++ kexi/plugins/macros/kexiactions/Makefile.in
+@@ -304,6 +304,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -648,7 +651,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -686,9 +689,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+--- kexi/plugins/macros/kexipart/Makefile.in
++++ kexi/plugins/macros/kexipart/Makefile.in
+@@ -311,6 +311,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -666,7 +669,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -704,9 +707,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kexi/plugins/macros/lib/Makefile.in
++++ kexi/plugins/macros/lib/Makefile.in
+@@ -293,6 +293,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -616,7 +619,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -654,9 +657,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLTLIBRARIES:
+--- kexi/plugins/macros/Makefile.in
++++ kexi/plugins/macros/Makefile.in
+@@ -256,6 +256,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -560,7 +563,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -598,9 +601,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kexi/plugins/macros/tests/Makefile.in
++++ kexi/plugins/macros/tests/Makefile.in
+@@ -320,6 +320,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -634,7 +637,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -672,9 +675,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
 --- kexi/plugins/Makefile.in
 +++ kexi/plugins/Makefile.in
-@@ -118,6 +118,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -255,6 +256,9 @@
+@@ -261,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83368,70 +26479,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -313,18 +317,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,8 +381,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -403,6 +408,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -484,6 +490,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -500,12 +507,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -540,7 +549,7 @@
+@@ -566,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -83440,7 +26488,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +587,9 @@
+@@ -604,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83454,15 +26502,7 @@
  mostlyclean-libtool:
 --- kexi/plugins/migration/Makefile.in
 +++ kexi/plugins/migration/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83472,70 +26512,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83544,7 +26521,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83558,15 +26535,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/queries/Makefile.in
 +++ kexi/plugins/queries/Makefile.in
-@@ -152,6 +152,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -289,6 +290,9 @@
+@@ -296,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83576,70 +26545,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,18 +351,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,8 +415,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -437,6 +442,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -518,6 +524,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -534,12 +541,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -642,7 +645,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83648,7 +26554,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -680,9 +683,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83662,15 +26568,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/relations/Makefile.in
 +++ kexi/plugins/relations/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83680,70 +26578,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -634,7 +637,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83752,7 +26587,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -672,9 +675,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83766,15 +26601,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/reports/Makefile.in
 +++ kexi/plugins/reports/Makefile.in
-@@ -196,6 +196,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -333,6 +334,9 @@
+@@ -340,6 +340,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83784,70 +26611,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -391,18 +395,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -457,8 +459,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -481,6 +486,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -562,6 +568,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -578,12 +585,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -681,7 +690,7 @@
+@@ -710,7 +713,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83856,7 +26620,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -719,9 +728,9 @@
+@@ -748,9 +751,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83870,15 +26634,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/kexiapp/Makefile.in
 +++ kexi/plugins/scripting/kexiapp/Makefile.in
-@@ -157,6 +157,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -294,6 +295,9 @@
+@@ -301,6 +301,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83888,70 +26644,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,18 +356,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,8 +420,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -442,6 +447,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -523,6 +529,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -539,12 +546,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83960,7 +26653,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83974,15 +26667,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/kexidb/Makefile.in
 +++ kexi/plugins/scripting/kexidb/Makefile.in
-@@ -164,6 +164,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -301,6 +302,9 @@
+@@ -308,6 +308,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83992,70 +26677,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,18 +363,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -425,8 +427,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -449,6 +454,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -530,6 +536,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -546,12 +553,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -626,7 +635,7 @@
+@@ -655,7 +658,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84064,7 +26686,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +673,9 @@
+@@ -693,9 +696,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84078,15 +26700,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/kexiscripting/Makefile.in
 +++ kexi/plugins/scripting/kexiscripting/Makefile.in
-@@ -166,6 +166,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -303,6 +304,9 @@
+@@ -310,6 +310,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84096,70 +26710,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,18 +365,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -427,8 +429,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -451,6 +456,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -532,6 +538,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -548,12 +555,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -629,7 +638,7 @@
+@@ -658,7 +661,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84168,7 +26719,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -667,9 +676,9 @@
+@@ -696,9 +699,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84182,15 +26733,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/Makefile.in
 +++ kexi/plugins/scripting/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84200,70 +26743,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -84272,7 +26752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84286,15 +26766,7 @@
  mostlyclean-libtool:
 --- kexi/plugins/scripting/scripts/copycenter/Makefile.in
 +++ kexi/plugins/scripting/scripts/copycenter/Makefile.in
-@@ -101,6 +101,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -238,6 +239,9 @@
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84304,70 +26776,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -296,18 +300,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,8 +364,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -386,6 +391,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -467,6 +473,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -483,12 +490,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -84376,7 +26785,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84390,15 +26799,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/scripts/exportxhtml/Makefile.in
 +++ kexi/plugins/scripting/scripts/exportxhtml/Makefile.in
-@@ -101,6 +101,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -238,6 +239,9 @@
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84408,70 +26809,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -296,18 +300,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,8 +364,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -386,6 +391,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -467,6 +473,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -483,12 +490,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -84480,7 +26818,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84494,15 +26832,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/scripts/importxhtml/Makefile.in
 +++ kexi/plugins/scripting/scripts/importxhtml/Makefile.in
-@@ -101,6 +101,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -238,6 +239,9 @@
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84512,70 +26842,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -296,18 +300,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,8 +364,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -386,6 +391,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -467,6 +473,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -483,12 +490,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -84584,7 +26851,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84598,15 +26865,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/scripts/Makefile.in
 +++ kexi/plugins/scripting/scripts/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84616,70 +26875,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -84688,7 +26884,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84702,15 +26898,7 @@
  mostlyclean-libtool:
 --- kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
 +++ kexi/plugins/scripting/scripts/projectdocumentor/Makefile.in
-@@ -101,6 +101,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -238,6 +239,9 @@
+@@ -245,6 +245,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84720,70 +26908,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -296,18 +300,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,8 +364,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -386,6 +391,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -467,6 +473,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -483,12 +490,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -84792,7 +26917,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84806,15 +26931,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
 +++ kexi/plugins/scripting/scripts/python/kexiapp/Makefile.in
-@@ -100,6 +100,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -237,6 +238,9 @@
+@@ -244,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84824,70 +26941,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -295,18 +299,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -361,8 +363,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -385,6 +390,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -466,6 +472,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -482,12 +489,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -522,7 +531,7 @@
+@@ -548,7 +551,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -84896,7 +26950,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -560,9 +569,9 @@
+@@ -586,9 +589,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84910,15 +26964,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/plugins/scripting/scripts/python/Makefile.in
 +++ kexi/plugins/scripting/scripts/python/Makefile.in
-@@ -113,6 +113,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -250,6 +251,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84928,70 +26974,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,8 +376,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -398,6 +403,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -479,6 +485,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -495,12 +502,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -549,7 +558,7 @@
+@@ -578,7 +581,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -85000,7 +26983,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +596,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85014,15 +26997,7 @@
  mostlyclean-libtool:
 --- kexi/plugins/tables/Makefile.in
 +++ kexi/plugins/tables/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -296,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85032,70 +27007,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -638,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85104,7 +27016,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -676,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85116,17 +27028,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kexi/tests/altertable/Makefile.in
++++ kexi/tests/altertable/Makefile.in
+@@ -292,6 +292,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -629,7 +632,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/kexi/Makefile.global $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -667,9 +670,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstPROGRAMS:
 --- kexi/tests/Makefile.in
 +++ kexi/tests/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85136,70 +27073,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -85208,7 +27082,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85222,15 +27096,7 @@
  mostlyclean-libtool:
 --- kexi/tests/newapi/Makefile.in
 +++ kexi/tests/newapi/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85240,70 +27106,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85312,7 +27115,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85326,15 +27129,7 @@
  clean-noinstPROGRAMS:
 --- kexi/tests/parser/Makefile.in
 +++ kexi/tests/parser/Makefile.in
-@@ -135,6 +135,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -272,6 +273,9 @@
+@@ -279,6 +279,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85344,70 +27139,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -330,18 +334,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -396,8 +398,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -420,6 +425,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -501,6 +507,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -517,12 +524,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85416,7 +27148,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85430,15 +27162,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/tests/startup/Makefile.in
 +++ kexi/tests/startup/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85448,70 +27172,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -622,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85520,7 +27181,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -660,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85534,15 +27195,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/tests/tableview/Makefile.in
 +++ kexi/tests/tableview/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85552,70 +27205,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85624,7 +27214,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85638,15 +27228,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/tests/widgets/Makefile.in
 +++ kexi/tests/widgets/Makefile.in
-@@ -131,6 +131,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -268,6 +269,9 @@
+@@ -275,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85656,70 +27238,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,18 +330,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,8 +394,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -416,6 +421,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -497,6 +503,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -513,12 +520,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85728,7 +27247,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85742,15 +27261,7 @@
  clean-noinstPROGRAMS:
 --- kexi/widget/Makefile.in
 +++ kexi/widget/Makefile.in
-@@ -172,6 +172,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -309,6 +310,9 @@
+@@ -316,6 +316,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85760,70 +27271,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -367,18 +371,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -433,8 +435,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -457,6 +462,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -538,6 +544,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -554,12 +561,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -664,7 +673,7 @@
+@@ -693,7 +696,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85832,7 +27280,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -702,9 +711,9 @@
+@@ -731,9 +734,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85846,15 +27294,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/widget/relations/Makefile.in
 +++ kexi/widget/relations/Makefile.in
-@@ -157,6 +157,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -294,6 +295,9 @@
+@@ -301,6 +301,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85864,70 +27304,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,18 +356,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,8 +420,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -442,6 +447,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -523,6 +529,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -539,12 +546,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -626,7 +635,7 @@
+@@ -655,7 +658,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85936,7 +27313,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +673,9 @@
+@@ -693,9 +696,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85950,15 +27327,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/widget/tableview/Makefile.in
 +++ kexi/widget/tableview/Makefile.in
-@@ -173,6 +173,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -310,6 +311,9 @@
+@@ -319,6 +319,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85968,70 +27337,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -368,18 +372,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -434,8 +436,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -458,6 +463,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -539,6 +545,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -555,12 +562,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -652,7 +661,7 @@
+@@ -684,7 +687,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86040,7 +27346,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +699,9 @@
+@@ -722,9 +725,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86054,15 +27360,7 @@
  	@$(NORMAL_INSTALL)
 --- kexi/widget/utils/Makefile.in
 +++ kexi/widget/utils/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -309,6 +309,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86072,70 +27370,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -644,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86144,7 +27379,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -682,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86158,15 +27393,7 @@
  	@$(NORMAL_INSTALL)
 --- kformula/Makefile.in
 +++ kformula/Makefile.in
-@@ -194,6 +194,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -331,6 +332,9 @@
+@@ -338,6 +338,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86176,70 +27403,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -389,18 +393,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -455,8 +457,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -479,6 +484,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -560,6 +566,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -576,12 +583,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -650,7 +659,7 @@
+@@ -676,7 +679,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -86248,7 +27412,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -688,9 +697,9 @@
+@@ -714,9 +717,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86262,15 +27426,7 @@
  	@$(NORMAL_INSTALL)
 --- kformula/pics/Makefile.in
 +++ kformula/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86280,70 +27436,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -517,7 +526,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -86352,7 +27445,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +564,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86366,15 +27459,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/config/Makefile.in
 +++ kivio/kiviopart/config/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86384,70 +27469,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -576,7 +585,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86456,7 +27478,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +623,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86470,15 +27492,7 @@
  clean-noinstLTLIBRARIES:
 --- kivio/kiviopart/kiviosdk/Makefile.in
 +++ kivio/kiviopart/kiviosdk/Makefile.in
-@@ -155,6 +155,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -292,6 +293,9 @@
+@@ -299,6 +299,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86488,70 +27502,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,18 +354,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -416,8 +418,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -440,6 +445,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -521,6 +527,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -537,12 +544,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -619,7 +628,7 @@
+@@ -645,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86560,7 +27511,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +666,9 @@
+@@ -683,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86574,15 +27525,7 @@
  clean-noinstLTLIBRARIES:
 --- kivio/kiviopart/Makefile.in
 +++ kivio/kiviopart/Makefile.in
-@@ -224,6 +224,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -361,6 +362,9 @@
+@@ -368,6 +368,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86592,70 +27535,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -419,18 +423,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -485,8 +487,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -509,6 +514,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -590,6 +596,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -606,12 +613,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -713,7 +722,7 @@
+@@ -739,7 +742,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -86664,7 +27544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -751,9 +760,9 @@
+@@ -777,9 +780,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86678,15 +27558,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/kiviopart/pics/Makefile.in
 +++ kivio/kiviopart/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86696,70 +27568,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -86768,7 +27577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86782,15 +27591,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Assorted/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Assorted/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86800,70 +27601,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -615,7 +624,7 @@
+@@ -641,7 +644,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -86872,7 +27610,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -653,9 +662,9 @@
+@@ -679,9 +682,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86886,15 +27624,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Circuit/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Circuit/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86904,70 +27634,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -621,7 +624,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -86976,7 +27643,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86990,15 +27657,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Cisco/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Cisco/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87008,70 +27667,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -977,7 +986,7 @@
+@@ -1003,7 +1006,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87080,7 +27676,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -1015,9 +1024,9 @@
+@@ -1041,9 +1044,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87094,15 +27690,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Civil/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Civil/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87112,70 +27700,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87184,7 +27709,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87198,15 +27723,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Contact/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Contact/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87216,70 +27733,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -567,7 +576,7 @@
+@@ -593,7 +596,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87288,7 +27742,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +614,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87302,15 +27756,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Electric/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Electric/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87320,70 +27766,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -551,7 +560,7 @@
+@@ -577,7 +580,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87392,7 +27775,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +598,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87406,15 +27789,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Jigsaw/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87424,70 +27799,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -567,7 +576,7 @@
+@@ -593,7 +596,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87496,7 +27808,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +614,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87510,15 +27822,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87528,70 +27832,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -548,7 +557,7 @@
+@@ -574,7 +577,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -87600,7 +27841,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -586,9 +595,9 @@
+@@ -612,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87614,15 +27855,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/MSE/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/MSE/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87632,70 +27865,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -547,7 +556,7 @@
+@@ -573,7 +576,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87704,7 +27874,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +594,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87718,15 +27888,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Network/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Network/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87736,70 +27898,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -623,7 +626,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87808,7 +27907,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87822,15 +27921,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Pneumatic/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87840,70 +27931,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -601,7 +604,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87912,7 +27940,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87926,15 +27954,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/SDL/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/SDL/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87944,70 +27964,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -569,7 +578,7 @@
+@@ -595,7 +598,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88016,7 +27973,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +616,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88030,15 +27987,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Dia/Sybase/Makefile.in
 +++ kivio/kiviopart/stencils/Dia/Sybase/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88048,70 +27997,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -547,7 +556,7 @@
+@@ -573,7 +576,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88120,7 +28006,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +594,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88134,15 +28020,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in
 +++ kivio/kiviopart/stencils/Flowcharting/BasicFlowcharting/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88152,70 +28030,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -570,7 +579,7 @@
+@@ -596,7 +599,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88224,7 +28039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +617,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88238,15 +28053,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in
 +++ kivio/kiviopart/stencils/Flowcharting/Extended/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88256,70 +28063,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -539,7 +548,7 @@
+@@ -565,7 +568,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88328,7 +28072,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +586,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88342,15 +28086,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in
 +++ kivio/kiviopart/stencils/Flowcharting/Logic/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88360,70 +28096,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -550,7 +559,7 @@
+@@ -576,7 +579,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88432,7 +28105,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -588,9 +597,9 @@
+@@ -614,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88446,15 +28119,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Flowcharting/Makefile.in
 +++ kivio/kiviopart/stencils/Flowcharting/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88464,70 +28129,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -571,7 +574,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -88536,7 +28138,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88550,15 +28152,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Geographic/Flags/Makefile.in
 +++ kivio/kiviopart/stencils/Geographic/Flags/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88568,70 +28162,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -567,7 +576,7 @@
+@@ -593,7 +596,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88640,7 +28171,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +614,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88654,15 +28185,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Geographic/Makefile.in
 +++ kivio/kiviopart/stencils/Geographic/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88672,70 +28195,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -571,7 +574,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -88744,7 +28204,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88758,15 +28218,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Geographic/Maps/Makefile.in
 +++ kivio/kiviopart/stencils/Geographic/Maps/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88776,70 +28228,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88848,7 +28237,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88862,15 +28251,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Hardware/Computer/Makefile.in
 +++ kivio/kiviopart/stencils/Hardware/Computer/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88880,70 +28261,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -563,7 +572,7 @@
+@@ -589,7 +592,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88952,7 +28270,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88966,15 +28284,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Hardware/Makefile.in
 +++ kivio/kiviopart/stencils/Hardware/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88984,70 +28294,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -571,7 +574,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -89056,7 +28303,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89070,15 +28317,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in
 +++ kivio/kiviopart/stencils/Hardware/Miscellaneous/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89088,70 +28327,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -537,7 +546,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89160,7 +28336,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +584,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89174,15 +28350,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Makefile.in
 +++ kivio/kiviopart/stencils/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89192,70 +28360,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -89264,7 +28369,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89278,15 +28383,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in
 +++ kivio/kiviopart/stencils/Miscellaneous/Arrows/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89296,70 +28393,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -541,7 +550,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89368,7 +28402,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +588,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89382,15 +28416,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in
 +++ kivio/kiviopart/stencils/Miscellaneous/Buildings/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89400,70 +28426,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89472,7 +28435,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89486,15 +28449,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in
 +++ kivio/kiviopart/stencils/Miscellaneous/ER/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89504,70 +28459,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -530,7 +539,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89576,7 +28468,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -568,9 +577,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89590,15 +28482,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Miscellaneous/Makefile.in
 +++ kivio/kiviopart/stencils/Miscellaneous/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89608,70 +28492,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -571,7 +574,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -89680,7 +28501,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89694,15 +28515,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in
 +++ kivio/kiviopart/stencils/Miscellaneous/NassiShneiderman/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89712,70 +28525,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -581,7 +584,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89784,7 +28534,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89798,15 +28548,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in
 +++ kivio/kiviopart/stencils/Miscellaneous/People/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89816,70 +28558,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -547,7 +556,7 @@
+@@ -573,7 +576,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89888,7 +28567,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +594,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89902,15 +28581,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in
 +++ kivio/kiviopart/stencils/Miscellaneous/Transport/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89920,70 +28591,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89992,7 +28600,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90006,15 +28614,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in
 +++ kivio/kiviopart/stencils/UML/ActivityDiagrams/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90024,70 +28624,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -581,7 +584,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -90096,7 +28633,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90110,15 +28647,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in
 +++ kivio/kiviopart/stencils/UML/ClassDiagrams/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90128,70 +28657,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -581,7 +584,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -90200,7 +28666,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90214,15 +28680,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/stencils/UML/Makefile.in
 +++ kivio/kiviopart/stencils/UML/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90232,70 +28690,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -549,7 +558,7 @@
+@@ -575,7 +578,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -90304,7 +28699,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +596,9 @@
+@@ -613,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90318,15 +28713,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/tiles/Makefile.in
 +++ kivio/kiviopart/tiles/Makefile.in
-@@ -111,6 +111,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -248,6 +249,9 @@
+@@ -255,6 +255,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90336,70 +28723,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -306,18 +310,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -372,8 +374,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -396,6 +401,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -477,6 +483,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -493,12 +500,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -90408,7 +28732,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90422,15 +28746,7 @@
  mostlyclean-libtool:
 --- kivio/kiviopart/tools/Makefile.in
 +++ kivio/kiviopart/tools/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90440,70 +28756,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90512,7 +28765,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90526,15 +28779,7 @@
  clean-noinstLTLIBRARIES:
 --- kivio/kiviopart/ui/Makefile.in
 +++ kivio/kiviopart/ui/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90544,70 +28789,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -592,7 +601,7 @@
+@@ -618,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90616,7 +28798,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +639,9 @@
+@@ -656,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90630,15 +28812,7 @@
  clean-noinstLTLIBRARIES:
 --- kivio/Makefile.in
 +++ kivio/Makefile.in
-@@ -113,6 +113,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -250,6 +251,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90648,70 +28822,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,8 +376,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -398,6 +403,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -479,6 +485,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -495,12 +502,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -90720,7 +28831,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90734,15 +28845,7 @@
  mostlyclean-libtool:
 --- kivio/plugins/kivioconnectortool/Makefile.in
 +++ kivio/plugins/kivioconnectortool/Makefile.in
-@@ -161,6 +161,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -298,6 +299,9 @@
+@@ -305,6 +305,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90752,70 +28855,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,18 +360,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -422,8 +424,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -446,6 +451,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -527,6 +533,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -543,12 +550,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -619,7 +628,7 @@
+@@ -645,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90824,7 +28864,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +666,9 @@
+@@ -683,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90838,15 +28878,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kivioconnectortool/straight_connector/Makefile.in
 +++ kivio/plugins/kivioconnectortool/straight_connector/Makefile.in
-@@ -140,6 +140,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -277,6 +278,9 @@
+@@ -284,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90856,70 +28888,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,18 +339,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,8 +403,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -425,6 +430,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -506,6 +512,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -522,12 +529,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90928,7 +28897,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90942,15 +28911,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kivioselecttool/Makefile.in
 +++ kivio/plugins/kivioselecttool/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -303,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90960,70 +28921,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -634,7 +637,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91032,7 +28930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -672,9 +675,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91046,15 +28944,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kivioselecttool/select_pics/Makefile.in
 +++ kivio/plugins/kivioselecttool/select_pics/Makefile.in
-@@ -111,6 +111,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -248,6 +249,9 @@
+@@ -255,6 +255,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91064,70 +28954,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -306,18 +310,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -372,8 +374,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -396,6 +401,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -477,6 +483,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -493,12 +500,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -536,7 +545,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -91136,7 +28963,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +583,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91150,15 +28977,7 @@
  mostlyclean-libtool:
 --- kivio/plugins/kiviosmlconnector/Makefile.in
 +++ kivio/plugins/kiviosmlconnector/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -303,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91168,70 +28987,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91240,7 +28996,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91254,15 +29010,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in
 +++ kivio/plugins/kiviosmlconnector/sml_connector/Makefile.in
-@@ -140,6 +140,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -277,6 +278,9 @@
+@@ -284,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91272,70 +29020,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,18 +339,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,8 +403,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -425,6 +430,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -506,6 +512,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -522,12 +529,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -573,7 +582,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91344,7 +29029,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +620,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91358,15 +29043,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kiviotargettool/Makefile.in
 +++ kivio/plugins/kiviotargettool/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91376,70 +29053,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91448,7 +29062,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91462,15 +29076,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kiviotexttool/Makefile.in
 +++ kivio/plugins/kiviotexttool/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91480,70 +29086,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -636,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91552,7 +29095,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -674,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91566,15 +29109,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kiviozoomtool/Makefile.in
 +++ kivio/plugins/kiviozoomtool/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -303,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91584,70 +29119,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -634,7 +637,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91656,7 +29128,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -672,9 +675,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91670,15 +29142,7 @@
  	@$(NORMAL_INSTALL)
 --- kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in
 +++ kivio/plugins/kiviozoomtool/zoom_pics/Makefile.in
-@@ -111,6 +111,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -248,6 +249,9 @@
+@@ -255,6 +255,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91688,70 +29152,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -306,18 +310,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -372,8 +374,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -396,6 +401,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -477,6 +483,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -493,12 +500,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -570,7 +573,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -91760,7 +29161,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -608,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91774,15 +29175,7 @@
  mostlyclean-libtool:
 --- kivio/plugins/Makefile.in
 +++ kivio/plugins/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91792,70 +29185,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -91864,7 +29194,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91878,15 +29208,7 @@
  mostlyclean-libtool:
 --- kivio/templates/basic/Makefile.in
 +++ kivio/templates/basic/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91896,70 +29218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -91968,7 +29227,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91982,15 +29241,7 @@
  mostlyclean-libtool:
 --- kivio/templates/Makefile.in
 +++ kivio/templates/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92000,70 +29251,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -92072,7 +29260,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92086,15 +29274,7 @@
  mostlyclean-libtool:
 --- koshell/Makefile.in
 +++ koshell/Makefile.in
-@@ -160,6 +160,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -297,6 +298,9 @@
+@@ -304,6 +304,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92104,70 +29284,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,18 +359,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -421,8 +423,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -445,6 +450,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -526,6 +532,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -542,12 +549,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -627,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -92176,7 +29293,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -665,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92190,15 +29307,7 @@
  	@$(NORMAL_INSTALL)
 --- kounavail/Makefile.in
 +++ kounavail/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92208,70 +29317,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -92280,7 +29326,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92294,15 +29340,7 @@
  	@$(NORMAL_INSTALL)
 --- kplato/Makefile.in
 +++ kplato/Makefile.in
-@@ -231,6 +231,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -368,6 +369,9 @@
+@@ -375,6 +375,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92312,70 +29350,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,18 +430,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -492,8 +494,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -516,6 +521,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -597,6 +603,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -613,12 +620,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -820,7 +829,7 @@
+@@ -846,7 +849,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -92384,7 +29359,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -858,9 +867,9 @@
+@@ -884,9 +887,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92398,15 +29373,7 @@
  	@$(NORMAL_INSTALL)
 --- kplato/pics/Makefile.in
 +++ kplato/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92416,70 +29383,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -517,7 +526,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -92488,7 +29392,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +564,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92502,15 +29406,7 @@
  mostlyclean-libtool:
 --- kplato/reports/Makefile.in
 +++ kplato/reports/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92520,70 +29416,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -92592,7 +29425,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92606,15 +29439,7 @@
  mostlyclean-libtool:
 --- kplato/templates/Makefile.in
 +++ kplato/templates/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92624,70 +29449,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -92696,7 +29458,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92710,15 +29472,7 @@
  mostlyclean-libtool:
 --- kplato/templates/Simple/Makefile.in
 +++ kplato/templates/Simple/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92728,70 +29482,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -92800,7 +29491,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92814,15 +29505,7 @@
  mostlyclean-libtool:
 --- kplato/tests/Makefile.in
 +++ kplato/tests/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92832,70 +29515,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -580,7 +589,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -92904,7 +29524,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +627,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92918,15 +29538,7 @@
  clean-checkLTLIBRARIES:
 --- kplato/toolbar/Makefile.in
 +++ kplato/toolbar/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92936,70 +29548,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93008,7 +29557,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93022,15 +29571,7 @@
  mostlyclean-libtool:
 --- kpresenter/autoformEdit/Makefile.in
 +++ kpresenter/autoformEdit/Makefile.in
-@@ -131,6 +131,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -268,6 +269,9 @@
+@@ -275,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93040,70 +29581,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,18 +330,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,8 +394,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -416,6 +421,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -497,6 +503,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -513,12 +520,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -93112,7 +29590,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93126,15 +29604,7 @@
  clean-noinstLTLIBRARIES:
 --- kpresenter/autoforms/Arrows/Makefile.in
 +++ kpresenter/autoforms/Arrows/Makefile.in
-@@ -109,6 +109,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -246,6 +247,9 @@
+@@ -253,6 +253,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93144,70 +29614,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -304,18 +308,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -370,8 +372,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -394,6 +399,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -475,6 +481,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -491,12 +498,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -547,7 +556,7 @@
+@@ -573,7 +576,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93216,7 +29623,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +594,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93230,15 +29637,7 @@
  mostlyclean-libtool:
 --- kpresenter/autoforms/Connections/Makefile.in
 +++ kpresenter/autoforms/Connections/Makefile.in
-@@ -109,6 +109,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -246,6 +247,9 @@
+@@ -253,6 +253,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93248,70 +29647,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -304,18 +308,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -370,8 +372,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -394,6 +399,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -475,6 +481,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -491,12 +498,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -553,7 +562,7 @@
+@@ -579,7 +582,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93320,7 +29656,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +600,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93334,15 +29670,7 @@
  mostlyclean-libtool:
 --- kpresenter/autoforms/Makefile.in
 +++ kpresenter/autoforms/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93352,70 +29680,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -571,7 +574,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -93424,7 +29689,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93438,15 +29703,7 @@
  mostlyclean-libtool:
 --- kpresenter/dtd/Makefile.in
 +++ kpresenter/dtd/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93456,70 +29713,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93528,7 +29722,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93542,15 +29736,7 @@
  mostlyclean-libtool:
 --- kpresenter/Makefile.in
 +++ kpresenter/Makefile.in
-@@ -268,6 +268,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -405,6 +406,9 @@
+@@ -412,6 +412,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93560,70 +29746,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,18 +467,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -529,8 +531,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -553,6 +558,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -634,6 +640,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -650,12 +657,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -843,7 +852,7 @@
+@@ -869,7 +872,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -93632,7 +29755,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -881,9 +890,9 @@
+@@ -907,9 +910,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93646,15 +29769,7 @@
  	@$(NORMAL_INSTALL)
 --- kpresenter/pics/Makefile.in
 +++ kpresenter/pics/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93664,70 +29779,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -546,7 +555,7 @@
+@@ -572,7 +575,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -93736,7 +29788,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +593,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93750,15 +29802,7 @@
  mostlyclean-libtool:
 --- kpresenter/pics/rotate/Makefile.in
 +++ kpresenter/pics/rotate/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93768,70 +29812,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -530,7 +539,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93840,7 +29821,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -568,9 +577,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93854,15 +29835,7 @@
  mostlyclean-libtool:
 --- kpresenter/slideshow/Makefile.in
 +++ kpresenter/slideshow/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93872,70 +29845,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93944,7 +29854,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93958,15 +29868,7 @@
  mostlyclean-libtool:
 --- kpresenter/templates/A4/Makefile.in
 +++ kpresenter/templates/A4/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93976,70 +29878,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -537,7 +546,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94048,7 +29887,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +584,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94062,15 +29901,7 @@
  mostlyclean-libtool:
 --- kpresenter/templates/common_icon/Makefile.in
 +++ kpresenter/templates/common_icon/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94080,70 +29911,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94152,7 +29920,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94166,15 +29934,7 @@
  mostlyclean-libtool:
 --- kpresenter/templates/legal/Makefile.in
 +++ kpresenter/templates/legal/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94184,70 +29944,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -537,7 +546,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94256,7 +29953,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +584,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94270,15 +29967,7 @@
  mostlyclean-libtool:
 --- kpresenter/templates/letter/Makefile.in
 +++ kpresenter/templates/letter/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94288,70 +29977,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -537,7 +546,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94360,7 +29986,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +584,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94374,15 +30000,7 @@
  mostlyclean-libtool:
 --- kpresenter/templates/Makefile.in
 +++ kpresenter/templates/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94392,70 +30010,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -94464,7 +30019,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94478,15 +30033,7 @@
  mostlyclean-libtool:
 --- kpresenter/templates/Screen/Makefile.in
 +++ kpresenter/templates/Screen/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94496,70 +30043,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94568,7 +30052,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94582,15 +30066,7 @@
  mostlyclean-libtool:
 --- kpresenter/templates/Screenpresentations/Makefile.in
 +++ kpresenter/templates/Screenpresentations/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94600,70 +30076,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -569,7 +572,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94672,7 +30085,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -607,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94686,15 +30099,7 @@
  mostlyclean-libtool:
 --- kpresenter/toolbar/Makefile.in
 +++ kpresenter/toolbar/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94704,70 +30109,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94776,7 +30118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94788,37 +30130,31 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -805,8 +814,8 @@
+@@ -833,9 +836,9 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-edit_picture.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-webpres.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-line_end.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-pie.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-slide_effect.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/slide_effect.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-circle.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/circle.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-pie.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-closed_cubicbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-cubicbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/cubicbeziercurve.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-rectangle.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/rectangle.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-quadricbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-circle.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/circle.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-quadricbeziercurve.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-mini_polygon.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/mini_polygon.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(kpresentericondir)/crystalsvg/48x48/actions/effect.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-closed_freehand.png $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/closed_freehand.png
-@@ -932,8 +941,8 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-freehand.png $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-pgnum.png $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
+@@ -960,9 +963,9 @@
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/edit_picture.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/webpres.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/line_end.png
++	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/slide_effect.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/circle.png
+-	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/pie.png
  	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/closed_cubicbeziercurve.png
- 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/cubicbeziercurve.png
- 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/rectangle.png
--	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
- 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/circle.png
-+	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/quadricbeziercurve.png
- 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/mini_polygon.png
- 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/48x48/actions/effect.png
- 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/32x32/actions/closed_freehand.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/16x16/actions/freehand.png
+ 	-rm -f $(DESTDIR)$(kpresentericondir)/crystalsvg/22x22/actions/pgnum.png
 --- krita/colorspaces/cmyk_u16/Makefile.in
 +++ krita/colorspaces/cmyk_u16/Makefile.in
-@@ -165,6 +165,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -302,6 +303,9 @@
+@@ -309,6 +309,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94828,70 +30164,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -360,18 +364,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -426,8 +428,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -450,6 +455,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -531,6 +537,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -547,12 +554,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -609,7 +618,7 @@
+@@ -635,7 +638,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -94900,7 +30173,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +656,9 @@
+@@ -673,9 +676,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94914,15 +30187,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/cmyk_u8/Makefile.in
 +++ krita/colorspaces/cmyk_u8/Makefile.in
-@@ -158,6 +158,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -295,6 +296,9 @@
+@@ -302,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94932,70 +30197,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,18 +357,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,8 +421,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -443,6 +448,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -524,6 +530,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -540,12 +547,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -95004,7 +30206,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95018,15 +30220,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/cmyk_u8/templates/Makefile.in
 +++ krita/colorspaces/cmyk_u8/templates/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95036,70 +30230,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -95108,7 +30239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95122,15 +30253,7 @@
  mostlyclean-libtool:
 --- krita/colorspaces/gray_u16/Makefile.in
 +++ krita/colorspaces/gray_u16/Makefile.in
-@@ -165,6 +165,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -302,6 +303,9 @@
+@@ -309,6 +309,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95140,70 +30263,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -360,18 +364,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -426,8 +428,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -450,6 +455,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -531,6 +537,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -547,12 +554,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -636,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -95212,7 +30272,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -674,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95226,15 +30286,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/gray_u8/Makefile.in
 +++ krita/colorspaces/gray_u8/Makefile.in
-@@ -164,6 +164,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -301,6 +302,9 @@
+@@ -308,6 +308,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95244,70 +30296,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,18 +363,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -425,8 +427,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -449,6 +454,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -530,6 +536,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -546,12 +553,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -631,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -95316,7 +30305,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -669,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95330,15 +30319,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/gray_u8/templates/Makefile.in
 +++ krita/colorspaces/gray_u8/templates/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95348,70 +30329,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -95420,7 +30338,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95434,15 +30352,7 @@
  mostlyclean-libtool:
 --- krita/colorspaces/gray_u8/tests/Makefile.in
 +++ krita/colorspaces/gray_u8/tests/Makefile.in
-@@ -126,6 +126,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -263,6 +264,9 @@
+@@ -270,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95452,70 +30362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -321,18 +325,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,8 +389,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -411,6 +416,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -492,6 +498,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -508,12 +515,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -95524,7 +30371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95538,15 +30385,7 @@
  clean-checkLTLIBRARIES:
 --- krita/colorspaces/lms_f32/Makefile.in
 +++ krita/colorspaces/lms_f32/Makefile.in
-@@ -151,6 +151,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -288,6 +289,9 @@
+@@ -295,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95556,70 +30395,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,18 +350,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -412,8 +414,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -436,6 +441,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -517,6 +523,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -533,12 +540,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -596,7 +605,7 @@
+@@ -622,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -95628,7 +30404,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +643,9 @@
+@@ -660,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95642,15 +30418,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/Makefile.in
 +++ krita/colorspaces/Makefile.in
-@@ -115,6 +115,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -252,6 +253,9 @@
+@@ -259,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95660,70 +30428,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -310,18 +314,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,8 +378,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -400,6 +405,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -481,6 +487,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -497,12 +504,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -570,7 +573,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -95732,7 +30437,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -608,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95746,15 +30451,7 @@
  mostlyclean-libtool:
 --- krita/colorspaces/rgb_f16half/Makefile.in
 +++ krita/colorspaces/rgb_f16half/Makefile.in
-@@ -167,6 +167,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -304,6 +305,9 @@
+@@ -311,6 +311,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95764,70 +30461,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -362,18 +366,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -428,8 +430,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -452,6 +457,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -533,6 +539,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -549,12 +556,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -615,7 +624,7 @@
+@@ -641,7 +644,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -95836,7 +30470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -653,9 +662,9 @@
+@@ -679,9 +682,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95850,15 +30484,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/rgb_f16half/tests/Makefile.in
 +++ krita/colorspaces/rgb_f16half/tests/Makefile.in
-@@ -128,6 +128,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -265,6 +266,9 @@
+@@ -272,6 +272,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95868,70 +30494,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -323,18 +327,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,8 +391,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -413,6 +418,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -494,6 +500,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -510,12 +517,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -564,7 +573,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -95940,7 +30503,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +611,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95954,15 +30517,7 @@
  clean-checkLTLIBRARIES:
 --- krita/colorspaces/rgb_f32/Makefile.in
 +++ krita/colorspaces/rgb_f32/Makefile.in
-@@ -165,6 +165,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -302,6 +303,9 @@
+@@ -309,6 +309,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95972,70 +30527,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -360,18 +364,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -426,8 +428,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -450,6 +455,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -531,6 +537,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -547,12 +554,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -612,7 +621,7 @@
+@@ -638,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96044,7 +30536,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +659,9 @@
+@@ -676,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96058,15 +30550,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/rgb_f32/tests/Makefile.in
 +++ krita/colorspaces/rgb_f32/tests/Makefile.in
-@@ -126,6 +126,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -263,6 +264,9 @@
+@@ -270,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96076,70 +30560,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -321,18 +325,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,8 +389,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -411,6 +416,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -492,6 +498,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -508,12 +515,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96148,7 +30569,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96162,15 +30583,7 @@
  clean-checkLTLIBRARIES:
 --- krita/colorspaces/rgb_u16/Makefile.in
 +++ krita/colorspaces/rgb_u16/Makefile.in
-@@ -165,6 +165,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -302,6 +303,9 @@
+@@ -309,6 +309,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96180,70 +30593,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -360,18 +364,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -426,8 +428,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -450,6 +455,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -531,6 +537,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -547,12 +554,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -637,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96252,7 +30602,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -675,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96266,15 +30616,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/rgb_u16/tests/Makefile.in
 +++ krita/colorspaces/rgb_u16/tests/Makefile.in
-@@ -126,6 +126,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -263,6 +264,9 @@
+@@ -270,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96284,70 +30626,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -321,18 +325,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,8 +389,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -411,6 +416,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -492,6 +498,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -508,12 +515,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96356,7 +30635,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96370,15 +30649,7 @@
  clean-checkLTLIBRARIES:
 --- krita/colorspaces/rgb_u8/Makefile.in
 +++ krita/colorspaces/rgb_u8/Makefile.in
-@@ -162,6 +162,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -299,6 +300,9 @@
+@@ -306,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96388,70 +30659,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -357,18 +361,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -423,8 +425,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -447,6 +452,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -528,6 +534,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -544,12 +551,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -609,7 +618,7 @@
+@@ -635,7 +638,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96460,7 +30668,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +656,9 @@
+@@ -673,9 +676,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96474,15 +30682,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/rgb_u8/templates/Makefile.in
 +++ krita/colorspaces/rgb_u8/templates/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96492,70 +30692,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -96564,7 +30701,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96578,15 +30715,7 @@
  mostlyclean-libtool:
 --- krita/colorspaces/rgb_u8/tests/Makefile.in
 +++ krita/colorspaces/rgb_u8/tests/Makefile.in
-@@ -128,6 +128,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -265,6 +266,9 @@
+@@ -272,6 +272,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96596,70 +30725,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -323,18 +327,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,8 +391,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -413,6 +418,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -494,6 +500,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -510,12 +517,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -562,7 +571,7 @@
+@@ -588,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -96668,7 +30734,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +609,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96682,15 +30748,7 @@
  clean-checkLTLIBRARIES:
 --- krita/colorspaces/wet/Makefile.in
 +++ krita/colorspaces/wet/Makefile.in
-@@ -153,6 +153,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -290,6 +291,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96700,70 +30758,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,18 +352,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +416,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -438,6 +443,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -519,6 +525,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -535,12 +542,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -623,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96772,7 +30767,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96786,15 +30781,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/wetsticky/brushop/Makefile.in
 +++ krita/colorspaces/wetsticky/brushop/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96804,70 +30791,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96876,7 +30800,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96890,15 +30814,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/colorspaces/wetsticky/Makefile.in
 +++ krita/colorspaces/wetsticky/Makefile.in
-@@ -160,6 +160,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -297,6 +298,9 @@
+@@ -304,6 +304,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96908,70 +30824,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,18 +359,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -421,8 +423,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -445,6 +450,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -526,6 +532,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -542,12 +549,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -96980,7 +30833,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96992,17 +30845,75 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/colorspaces/ycbcr_u16/Makefile.in
++++ krita/colorspaces/ycbcr_u16/Makefile.in
+@@ -296,6 +296,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -622,7 +625,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -660,9 +663,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- krita/colorspaces/ycbcr_u8/Makefile.in
++++ krita/colorspaces/ycbcr_u8/Makefile.in
+@@ -297,6 +297,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -621,7 +624,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -659,9 +662,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/core/Makefile.in
 +++ krita/core/Makefile.in
-@@ -202,6 +202,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -339,6 +340,9 @@
+@@ -350,6 +350,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97012,70 +30923,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,18 +401,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -463,8 +465,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -487,6 +492,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -568,6 +574,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -584,12 +591,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -689,7 +698,7 @@
+@@ -723,7 +726,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -97084,7 +30932,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -727,9 +736,9 @@
+@@ -761,9 +764,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97098,15 +30946,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/core/tests/Makefile.in
 +++ krita/core/tests/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97116,70 +30956,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -97188,7 +30965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97202,15 +30979,7 @@
  clean-checkLTLIBRARIES:
 --- krita/core/tiles/Makefile.in
 +++ krita/core/tiles/Makefile.in
-@@ -160,6 +160,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -297,6 +298,9 @@
+@@ -304,6 +304,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97220,70 +30989,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,18 +359,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -421,8 +423,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -445,6 +450,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -526,6 +532,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -542,12 +549,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -97292,7 +30998,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97306,15 +31012,7 @@
  clean-noinstLTLIBRARIES:
 --- krita/core/tiles/tests/Makefile.in
 +++ krita/core/tiles/tests/Makefile.in
-@@ -127,6 +127,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -264,6 +265,9 @@
+@@ -271,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97324,70 +31022,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -322,18 +326,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -388,8 +390,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -412,6 +417,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -493,6 +499,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -509,12 +516,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97396,7 +31031,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97410,15 +31045,7 @@
  clean-checkLTLIBRARIES:
 --- krita/data/brushes/Makefile.in
 +++ krita/data/brushes/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97428,70 +31055,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -621,7 +624,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -97500,7 +31064,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97514,15 +31078,7 @@
  mostlyclean-libtool:
 --- krita/data/gradients/Makefile.in
 +++ krita/data/gradients/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97532,70 +31088,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -581,7 +584,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -97604,7 +31097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97618,15 +31111,7 @@
  mostlyclean-libtool:
 --- krita/data/images/Makefile.in
 +++ krita/data/images/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97636,70 +31121,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -530,7 +539,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -97708,7 +31130,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -568,9 +577,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97722,15 +31144,7 @@
  mostlyclean-libtool:
 --- krita/data/Makefile.in
 +++ krita/data/Makefile.in
-@@ -122,6 +122,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -259,6 +260,9 @@
+@@ -266,6 +266,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97740,70 +31154,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,18 +321,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,8 +385,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -407,6 +412,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -488,6 +494,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -504,12 +511,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -549,7 +558,7 @@
+@@ -575,7 +578,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -97812,7 +31163,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +596,9 @@
+@@ -613,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97826,15 +31177,7 @@
  mostlyclean-libtool:
 --- krita/data/palettes/Makefile.in
 +++ krita/data/palettes/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97844,70 +31187,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -576,7 +585,7 @@
+@@ -602,7 +605,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -97916,7 +31196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +623,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97930,15 +31210,7 @@
  mostlyclean-libtool:
 --- krita/data/patterns/Makefile.in
 +++ krita/data/patterns/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97948,70 +31220,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -98020,7 +31229,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98034,15 +31243,7 @@
  mostlyclean-libtool:
 --- krita/data/profiles/Makefile.in
 +++ krita/data/profiles/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98052,70 +31253,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -98124,7 +31262,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98138,15 +31276,7 @@
  mostlyclean-libtool:
 --- krita/dtd/Makefile.in
 +++ krita/dtd/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98156,70 +31286,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -98228,7 +31295,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98242,15 +31309,7 @@
  mostlyclean-libtool:
 --- krita/kritacolor/colorspaces/Makefile.in
 +++ krita/kritacolor/colorspaces/Makefile.in
-@@ -135,6 +135,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -272,6 +273,9 @@
+@@ -279,6 +279,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98260,70 +31319,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -330,18 +334,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -396,8 +398,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -420,6 +425,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -501,6 +507,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -517,12 +524,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -98332,7 +31328,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98346,15 +31342,7 @@
  clean-noinstLTLIBRARIES:
 --- krita/kritacolor/Makefile.in
 +++ krita/kritacolor/Makefile.in
-@@ -180,6 +180,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -317,6 +318,9 @@
+@@ -324,6 +324,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98364,70 +31352,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,18 +379,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -441,8 +443,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -465,6 +470,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -546,6 +552,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -562,12 +569,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -642,7 +651,7 @@
+@@ -668,7 +671,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -98436,7 +31361,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -680,9 +689,9 @@
+@@ -706,9 +709,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98450,15 +31375,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/kritacolor/tests/Makefile.in
 +++ krita/kritacolor/tests/Makefile.in
-@@ -127,6 +127,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -264,6 +265,9 @@
+@@ -271,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98468,70 +31385,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -322,18 +326,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -388,8 +390,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -412,6 +417,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -493,6 +499,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -509,12 +516,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98540,7 +31394,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98554,15 +31408,7 @@
  clean-checkLTLIBRARIES:
 --- krita/Makefile.in
 +++ krita/Makefile.in
-@@ -194,6 +194,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -331,6 +332,9 @@
+@@ -338,6 +338,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98572,70 +31418,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -389,18 +393,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -455,8 +457,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -479,6 +484,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -560,6 +566,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -576,12 +583,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -642,7 +651,7 @@
+@@ -668,7 +671,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -98644,7 +31427,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -680,9 +689,9 @@
+@@ -706,9 +709,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98658,15 +31441,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/pics/Makefile.in
 +++ krita/pics/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98676,70 +31451,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -569,7 +572,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -98748,7 +31460,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -607,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98760,17 +31472,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- krita/plugins/filters/blur/Makefile.in
++++ krita/plugins/filters/blur/Makefile.in
+@@ -290,6 +290,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -610,7 +613,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -648,9 +651,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/bumpmap/Makefile.in
 +++ krita/plugins/filters/bumpmap/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98780,70 +31517,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -581,7 +590,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -98852,7 +31526,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +628,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98866,15 +31540,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/cimg/Makefile.in
 +++ krita/plugins/filters/cimg/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98884,70 +31550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -98956,7 +31559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98968,17 +31571,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/filters/colors/Makefile.in
++++ krita/plugins/filters/colors/Makefile.in
+@@ -294,6 +294,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -614,7 +617,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -652,9 +655,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/colorsfilters/Makefile.in
 +++ krita/plugins/filters/colorsfilters/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98988,70 +31616,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -621,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99060,7 +31625,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99074,15 +31639,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/convolutionfilters/Makefile.in
 +++ krita/plugins/filters/convolutionfilters/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99092,70 +31649,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -627,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99164,7 +31658,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -665,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99178,15 +31672,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/cubismfilter/Makefile.in
 +++ krita/plugins/filters/cubismfilter/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99196,70 +31682,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99268,7 +31691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99282,15 +31705,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/embossfilter/Makefile.in
 +++ krita/plugins/filters/embossfilter/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99300,70 +31715,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99372,7 +31724,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99386,15 +31738,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/example/Makefile.in
 +++ krita/plugins/filters/example/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99404,70 +31748,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99476,7 +31757,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99488,17 +31769,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/filters/fastcolortransfer/Makefile.in
++++ krita/plugins/filters/fastcolortransfer/Makefile.in
+@@ -291,6 +291,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -614,7 +617,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -652,9 +655,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/imageenhancement/Makefile.in
 +++ krita/plugins/filters/imageenhancement/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99508,70 +31814,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -99580,7 +31823,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99592,17 +31835,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/filters/lenscorrectionfilter/Makefile.in
++++ krita/plugins/filters/lenscorrectionfilter/Makefile.in
+@@ -292,6 +292,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -615,7 +618,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -653,9 +656,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/Makefile.in
 +++ krita/plugins/filters/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99612,70 +31880,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -547,7 +556,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -99684,7 +31889,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +594,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99696,17 +31901,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- krita/plugins/filters/noisefilter/Makefile.in
++++ krita/plugins/filters/noisefilter/Makefile.in
+@@ -288,6 +288,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -611,7 +614,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -649,9 +652,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/oilpaintfilter/Makefile.in
 +++ krita/plugins/filters/oilpaintfilter/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99716,70 +31946,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99788,7 +31955,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99802,15 +31969,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/pixelizefilter/Makefile.in
 +++ krita/plugins/filters/pixelizefilter/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99820,70 +31979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99892,7 +31988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99906,15 +32002,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/raindropsfilter/Makefile.in
 +++ krita/plugins/filters/raindropsfilter/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99924,70 +32012,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -99996,7 +32021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100008,17 +32033,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/filters/randompickfilter/Makefile.in
++++ krita/plugins/filters/randompickfilter/Makefile.in
+@@ -291,6 +291,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -614,7 +617,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -652,9 +655,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/roundcorners/Makefile.in
 +++ krita/plugins/filters/roundcorners/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100028,70 +32078,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100100,7 +32087,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100114,15 +32101,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/smalltilesfilter/Makefile.in
 +++ krita/plugins/filters/smalltilesfilter/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100132,70 +32111,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100204,7 +32120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100218,15 +32134,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/sobelfilter/Makefile.in
 +++ krita/plugins/filters/sobelfilter/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100236,70 +32144,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100308,7 +32153,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100322,15 +32167,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/filters/threadtest/Makefile.in
 +++ krita/plugins/filters/threadtest/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100340,70 +32177,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -576,7 +585,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100412,7 +32186,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +623,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100424,17 +32198,75 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/filters/unsharp/Makefile.in
++++ krita/plugins/filters/unsharp/Makefile.in
+@@ -287,6 +287,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -606,7 +609,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -644,9 +647,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- krita/plugins/filters/wavefilter/Makefile.in
++++ krita/plugins/filters/wavefilter/Makefile.in
+@@ -288,6 +288,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -611,7 +614,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -649,9 +652,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/Makefile.in
 +++ krita/plugins/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100444,70 +32276,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -100516,7 +32285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100528,17 +32297,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- krita/plugins/paintops/cpaint/Makefile.in
++++ krita/plugins/paintops/cpaint/Makefile.in
+@@ -292,6 +292,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -637,7 +640,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -675,9 +678,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/paintops/defaultpaintops/Makefile.in
 +++ krita/plugins/paintops/defaultpaintops/Makefile.in
-@@ -152,6 +152,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -289,6 +290,9 @@
+@@ -296,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100548,70 +32342,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,18 +351,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,8 +415,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -437,6 +442,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -518,6 +524,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -534,12 +541,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -640,7 +643,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100620,7 +32351,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -678,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100634,15 +32365,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/paintops/Makefile.in
 +++ krita/plugins/paintops/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100652,70 +32375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -536,7 +545,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -100724,7 +32384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +583,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100738,15 +32398,7 @@
  mostlyclean-libtool:
 --- krita/plugins/paintops/smearybrush/Makefile.in
 +++ krita/plugins/paintops/smearybrush/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100756,70 +32408,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100828,7 +32417,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100842,15 +32431,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/defaulttools/Makefile.in
 +++ krita/plugins/tools/defaulttools/Makefile.in
-@@ -152,6 +152,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -289,6 +290,9 @@
+@@ -296,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100860,70 +32441,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,18 +351,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,8 +415,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -437,6 +442,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -518,6 +524,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -534,12 +541,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -660,7 +669,7 @@
+@@ -691,7 +694,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100932,7 +32450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -698,9 +707,9 @@
+@@ -729,9 +732,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100946,15 +32464,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/Makefile.in
 +++ krita/plugins/tools/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100964,70 +32474,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -101036,7 +32483,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101050,15 +32497,7 @@
  mostlyclean-libtool:
 --- krita/plugins/tools/selectiontools/Makefile.in
 +++ krita/plugins/tools/selectiontools/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101068,70 +32507,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -626,7 +635,7 @@
+@@ -652,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101140,7 +32516,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +673,9 @@
+@@ -690,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101154,15 +32530,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/tool_crop/Makefile.in
 +++ krita/plugins/tools/tool_crop/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101172,70 +32540,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101244,7 +32549,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101256,17 +32561,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/tools/tool_curves/Makefile.in
++++ krita/plugins/tools/tool_curves/Makefile.in
+@@ -292,6 +292,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -657,7 +660,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -695,9 +698,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/tool_filter/Makefile.in
 +++ krita/plugins/tools/tool_filter/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101276,70 +32606,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101348,7 +32615,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101360,17 +32627,75 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/tools/tool_perspectivegrid/Makefile.in
++++ krita/plugins/tools/tool_perspectivegrid/Makefile.in
+@@ -289,6 +289,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -622,7 +625,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -660,9 +663,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- krita/plugins/tools/tool_perspectivetransform/Makefile.in
++++ krita/plugins/tools/tool_perspectivetransform/Makefile.in
+@@ -289,6 +289,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -622,7 +625,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -660,9 +663,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/tool_polygon/Makefile.in
 +++ krita/plugins/tools/tool_polygon/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101380,70 +32705,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101452,7 +32714,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101466,15 +32728,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/tool_polyline/Makefile.in
 +++ krita/plugins/tools/tool_polyline/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101484,70 +32738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -596,7 +605,7 @@
+@@ -622,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101556,7 +32747,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +643,9 @@
+@@ -660,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101570,15 +32761,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/tool_selectsimilar/Makefile.in
 +++ krita/plugins/tools/tool_selectsimilar/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101588,70 +32771,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101660,7 +32780,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101674,15 +32794,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/tool_star/Makefile.in
 +++ krita/plugins/tools/tool_star/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101692,70 +32804,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101764,7 +32813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101778,15 +32827,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/tools/tool_transform/Makefile.in
 +++ krita/plugins/tools/tool_transform/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101796,70 +32837,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -628,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101868,7 +32846,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -666,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101882,15 +32860,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/colorrange/Makefile.in
 +++ krita/plugins/viewplugins/colorrange/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101900,70 +32870,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -101972,7 +32879,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101986,15 +32893,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/colorspaceconversion/Makefile.in
 +++ krita/plugins/viewplugins/colorspaceconversion/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102004,70 +32903,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102076,7 +32912,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102090,15 +32926,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/dropshadow/Makefile.in
 +++ krita/plugins/viewplugins/dropshadow/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102108,70 +32936,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102180,7 +32945,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102194,15 +32959,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/filtersgallery/Makefile.in
 +++ krita/plugins/viewplugins/filtersgallery/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102212,70 +32969,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102284,7 +32978,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102298,15 +32992,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/histogram/Makefile.in
 +++ krita/plugins/viewplugins/histogram/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102316,70 +33002,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102388,7 +33011,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102402,15 +33025,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/histogram_docker/Makefile.in
 +++ krita/plugins/viewplugins/histogram_docker/Makefile.in
-@@ -150,6 +150,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -287,6 +288,9 @@
+@@ -294,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102420,70 +33035,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,18 +349,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,8 +413,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -435,6 +440,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -516,6 +522,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -532,12 +539,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102492,7 +33044,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102506,15 +33058,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/history_docker/Makefile.in
 +++ krita/plugins/viewplugins/history_docker/Makefile.in
-@@ -139,6 +139,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -276,6 +277,9 @@
+@@ -283,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102524,70 +33068,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,18 +338,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -400,8 +402,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -424,6 +429,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -505,6 +511,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -521,12 +528,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -573,7 +582,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102596,7 +33077,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +620,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102610,15 +33091,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/imagesize/Makefile.in
 +++ krita/plugins/viewplugins/imagesize/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102628,70 +33101,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102700,7 +33110,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102714,15 +33124,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/Makefile.in
 +++ krita/plugins/viewplugins/Makefile.in
-@@ -114,6 +114,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -251,6 +252,9 @@
+@@ -259,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102732,70 +33134,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -309,18 +313,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,8 +377,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -399,6 +404,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -480,6 +486,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -496,12 +503,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -549,7 +558,7 @@
+@@ -578,7 +581,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -102804,7 +33143,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +596,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102816,17 +33155,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- krita/plugins/viewplugins/modify_selection/Makefile.in
++++ krita/plugins/viewplugins/modify_selection/Makefile.in
+@@ -294,6 +294,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -621,7 +624,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -659,9 +662,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/performancetest/Makefile.in
 +++ krita/plugins/viewplugins/performancetest/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102836,70 +33200,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -102908,7 +33209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -102922,15 +33223,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/rotateimage/Makefile.in
 +++ krita/plugins/viewplugins/rotateimage/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -102940,70 +33233,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -103012,7 +33242,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103026,15 +33256,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/screenshot/Makefile.in
 +++ krita/plugins/viewplugins/screenshot/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103044,70 +33266,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -103116,7 +33275,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103130,15 +33289,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/scripting/kritacore/Makefile.in
 +++ krita/plugins/viewplugins/scripting/kritacore/Makefile.in
-@@ -169,6 +169,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -306,6 +307,9 @@
+@@ -313,6 +313,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103148,70 +33299,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -364,18 +368,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -430,8 +432,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -454,6 +459,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -535,6 +541,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -551,12 +558,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -642,7 +645,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -103220,7 +33308,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -680,9 +683,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103234,15 +33322,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
 +++ krita/plugins/viewplugins/scripting/kritascripting/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103252,70 +33332,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -103324,7 +33341,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103338,15 +33355,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/scripting/Makefile.in
 +++ krita/plugins/viewplugins/scripting/Makefile.in
-@@ -159,6 +159,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -296,6 +297,9 @@
+@@ -303,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103356,70 +33365,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,18 +358,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -420,8 +422,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -444,6 +449,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -525,6 +531,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -541,12 +548,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -103428,7 +33374,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103442,15 +33388,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/scripting/samples/Makefile.in
 +++ krita/plugins/viewplugins/scripting/samples/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103460,70 +33398,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -103532,7 +33407,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103546,15 +33421,7 @@
  mostlyclean-libtool:
 --- krita/plugins/viewplugins/scripting/samples/python/Makefile.in
 +++ krita/plugins/viewplugins/scripting/samples/python/Makefile.in
-@@ -102,6 +102,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -239,6 +240,9 @@
+@@ -246,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103564,70 +33431,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -297,18 +301,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -363,8 +365,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -387,6 +392,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -468,6 +474,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -484,12 +491,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -526,7 +535,7 @@
+@@ -552,7 +555,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -103636,7 +33440,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -564,9 +573,9 @@
+@@ -590,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103650,15 +33454,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in
 +++ krita/plugins/viewplugins/scripting/samples/ruby/Makefile.in
-@@ -113,6 +113,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -250,6 +251,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103668,70 +33464,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,8 +376,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -398,6 +403,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -479,6 +485,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -495,12 +502,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -571,7 +574,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -103740,7 +33473,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103754,15 +33487,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/separate_channels/Makefile.in
 +++ krita/plugins/viewplugins/separate_channels/Makefile.in
-@@ -148,6 +148,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -285,6 +286,9 @@
+@@ -292,6 +292,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103772,70 +33497,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,18 +347,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,8 +411,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -433,6 +438,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -514,6 +520,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -530,12 +537,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -621,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -103844,7 +33506,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103858,15 +33520,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/shearimage/Makefile.in
 +++ krita/plugins/viewplugins/shearimage/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103876,70 +33530,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -103948,7 +33539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103960,17 +33551,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- krita/plugins/viewplugins/substrate/Makefile.in
++++ krita/plugins/viewplugins/substrate/Makefile.in
+@@ -291,6 +291,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -614,7 +617,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -652,9 +655,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- krita/plugins/viewplugins/variations/Makefile.in
 +++ krita/plugins/viewplugins/variations/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103980,70 +33596,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -104052,7 +33605,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104066,15 +33619,7 @@
  	@$(NORMAL_INSTALL)
 --- krita/sdk/Makefile.in
 +++ krita/sdk/Makefile.in
-@@ -137,6 +137,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -274,6 +275,9 @@
+@@ -281,6 +281,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104084,70 +33629,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -332,18 +336,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -398,8 +400,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -422,6 +427,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -503,6 +509,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -519,12 +526,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -104156,7 +33638,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104170,15 +33652,7 @@
  clean-noinstLTLIBRARIES:
 --- krita/ui/Makefile.in
 +++ krita/ui/Makefile.in
-@@ -207,6 +207,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -344,6 +345,9 @@
+@@ -354,6 +354,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104188,70 +33662,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -402,18 +406,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -468,8 +470,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -492,6 +497,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -573,6 +579,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -589,12 +596,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -731,7 +740,7 @@
+@@ -762,7 +765,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -104260,7 +33671,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -769,9 +778,9 @@
+@@ -800,9 +803,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104274,15 +33685,7 @@
  	@$(NORMAL_INSTALL)
 --- kspread/dialogs/Makefile.in
 +++ kspread/dialogs/Makefile.in
-@@ -158,6 +158,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -295,6 +296,9 @@
+@@ -302,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104292,70 +33695,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,18 +357,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,8 +421,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -443,6 +448,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -524,6 +530,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -540,12 +547,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -689,7 +698,7 @@
+@@ -715,7 +718,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -104364,7 +33704,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -727,9 +736,9 @@
+@@ -753,9 +756,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104378,15 +33718,7 @@
  clean-noinstLTLIBRARIES:
 --- kspread/dtd/Makefile.in
 +++ kspread/dtd/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104396,70 +33728,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -104468,7 +33737,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104482,15 +33751,7 @@
  mostlyclean-libtool:
 --- kspread/extensions/Makefile.in
 +++ kspread/extensions/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104500,70 +33761,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -531,7 +540,7 @@
+@@ -557,7 +560,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -104572,7 +33770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -569,9 +578,9 @@
+@@ -595,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104586,15 +33784,7 @@
  mostlyclean-libtool:
 --- kspread/Makefile.in
 +++ kspread/Makefile.in
-@@ -241,6 +241,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -378,6 +379,9 @@
+@@ -385,6 +385,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104604,70 +33794,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -436,18 +440,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -502,8 +504,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -526,6 +531,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -607,6 +613,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -623,12 +630,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -737,7 +746,7 @@
+@@ -763,7 +766,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -104676,7 +33803,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -775,9 +784,9 @@
+@@ -801,9 +804,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104690,15 +33817,7 @@
  	@$(NORMAL_INSTALL)
 --- kspread/pics/Makefile.in
 +++ kspread/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104708,70 +33827,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -517,7 +526,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -104780,7 +33836,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +564,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104794,15 +33850,7 @@
  mostlyclean-libtool:
 --- kspread/plugins/calculator/Makefile.in
 +++ kspread/plugins/calculator/Makefile.in
-@@ -156,6 +156,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -293,6 +294,9 @@
+@@ -300,6 +300,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104812,70 +33860,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,18 +355,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -417,8 +419,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -441,6 +446,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -522,6 +528,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -538,12 +545,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -104884,7 +33869,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -104898,15 +33883,7 @@
  	@$(NORMAL_INSTALL)
 --- kspread/plugins/calculator/pics/Makefile.in
 +++ kspread/plugins/calculator/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -104916,70 +33893,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -517,7 +526,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -104988,7 +33902,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +564,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105002,15 +33916,7 @@
  mostlyclean-libtool:
 --- kspread/plugins/insertcalendar/Makefile.in
 +++ kspread/plugins/insertcalendar/Makefile.in
-@@ -158,6 +158,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -295,6 +296,9 @@
+@@ -302,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105020,70 +33926,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,18 +357,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,8 +421,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -443,6 +448,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -524,6 +530,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -540,12 +547,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -602,7 +611,7 @@
+@@ -628,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -105092,7 +33935,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +649,9 @@
+@@ -666,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105106,15 +33949,7 @@
  	@$(NORMAL_INSTALL)
 --- kspread/plugins/Makefile.in
 +++ kspread/plugins/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105124,70 +33959,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -105196,7 +33968,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105208,17 +33980,174 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- kspread/plugins/scripting/kspreadcore/Makefile.in
++++ kspread/plugins/scripting/kspreadcore/Makefile.in
+@@ -305,6 +305,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -627,7 +630,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -665,9 +668,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kspread/plugins/scripting/Makefile.in
++++ kspread/plugins/scripting/Makefile.in
+@@ -302,6 +302,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -623,7 +626,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -661,9 +664,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kspread/plugins/scripting/scripts/exporthtml/Makefile.in
++++ kspread/plugins/scripting/scripts/exporthtml/Makefile.in
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -548,7 +551,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -586,9 +589,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-scriptsSCRIPTS: $(scripts_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+--- kspread/plugins/scripting/scripts/Makefile.in
++++ kspread/plugins/scripting/scripts/Makefile.in
+@@ -256,6 +256,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -597,9 +600,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+--- kspread/plugins/scripting/scripts/scripteditor/Makefile.in
++++ kspread/plugins/scripting/scripts/scripteditor/Makefile.in
+@@ -244,6 +244,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -548,7 +551,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -586,9 +589,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-scriptsSCRIPTS: $(scripts_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
 --- kspread/sheetstyles/Makefile.in
 +++ kspread/sheetstyles/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105228,70 +34157,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -105300,7 +34166,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105314,15 +34180,7 @@
  mostlyclean-libtool:
 --- kspread/templates/Business/Makefile.in
 +++ kspread/templates/Business/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105332,70 +34190,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -105404,7 +34199,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105418,15 +34213,7 @@
  mostlyclean-libtool:
 --- kspread/templates/General/Makefile.in
 +++ kspread/templates/General/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105436,70 +34223,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -105508,7 +34232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105522,15 +34246,7 @@
  mostlyclean-libtool:
 --- kspread/templates/HomeFamily/Makefile.in
 +++ kspread/templates/HomeFamily/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105540,70 +34256,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -534,7 +543,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -105612,7 +34265,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +581,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105626,15 +34279,7 @@
  mostlyclean-libtool:
 --- kspread/templates/Makefile.in
 +++ kspread/templates/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105644,70 +34289,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -105716,7 +34298,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105730,15 +34312,7 @@
  mostlyclean-libtool:
 --- kspread/tests/Makefile.in
 +++ kspread/tests/Makefile.in
-@@ -140,6 +140,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -277,6 +278,9 @@
+@@ -284,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105748,70 +34322,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,18 +339,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,8 +403,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -425,6 +430,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -506,6 +512,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -522,12 +529,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -105820,7 +34331,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105834,15 +34345,7 @@
  clean-noinstLTLIBRARIES:
 --- kspread/toolbar/crystalsvg/Makefile.in
 +++ kspread/toolbar/crystalsvg/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105852,70 +34355,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -105924,7 +34364,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -105938,15 +34378,7 @@
  mostlyclean-libtool:
 --- kspread/toolbar/Makefile.in
 +++ kspread/toolbar/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -105956,70 +34388,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -106028,7 +34397,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106042,15 +34411,7 @@
  mostlyclean-libtool:
 --- kugar/kudesigner/Makefile.in
 +++ kugar/kudesigner/Makefile.in
-@@ -201,6 +201,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -338,6 +339,9 @@
+@@ -345,6 +345,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106060,70 +34421,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,18 +400,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -462,8 +464,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -486,6 +491,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -567,6 +573,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -583,12 +590,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -660,7 +669,7 @@
+@@ -686,7 +689,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -106132,7 +34430,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -698,9 +707,9 @@
+@@ -724,9 +727,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106146,15 +34444,7 @@
  	@$(NORMAL_INSTALL)
 --- kugar/kudesigner/pics/Makefile.in
 +++ kugar/kudesigner/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106164,70 +34454,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -517,7 +526,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -106236,7 +34463,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +564,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106250,15 +34477,7 @@
  mostlyclean-libtool:
 --- kugar/kudesigner/templates/General/Makefile.in
 +++ kugar/kudesigner/templates/General/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106268,70 +34487,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -569,7 +572,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -106340,7 +34496,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -607,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106354,15 +34510,7 @@
  mostlyclean-libtool:
 --- kugar/kudesigner/templates/Makefile.in
 +++ kugar/kudesigner/templates/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106372,70 +34520,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -106444,7 +34529,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106458,15 +34543,7 @@
  mostlyclean-libtool:
 --- kugar/kudesigner/toolbar/Makefile.in
 +++ kugar/kudesigner/toolbar/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106476,70 +34553,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -106548,7 +34562,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106562,15 +34576,7 @@
  mostlyclean-libtool:
 --- kugar/kudesigner_lib/Makefile.in
 +++ kugar/kudesigner_lib/Makefile.in
-@@ -139,6 +139,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -276,6 +277,9 @@
+@@ -283,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106580,70 +34586,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,18 +338,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -400,8 +402,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -424,6 +429,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -505,6 +511,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -521,12 +528,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -106652,7 +34595,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106666,15 +34609,7 @@
  clean-noinstLTLIBRARIES:
 --- kugar/lib/Makefile.in
 +++ kugar/lib/Makefile.in
-@@ -151,6 +151,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -288,6 +289,9 @@
+@@ -295,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106684,70 +34619,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,18 +350,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -412,8 +414,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -436,6 +441,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -517,6 +523,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -533,12 +540,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -106756,7 +34628,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106770,15 +34642,7 @@
  	@$(NORMAL_INSTALL)
 --- kugar/Makefile.in
 +++ kugar/Makefile.in
-@@ -113,6 +113,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -250,6 +251,9 @@
+@@ -257,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106788,70 +34652,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -308,18 +312,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,8 +376,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -398,6 +403,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -479,6 +485,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -495,12 +502,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -537,7 +546,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -106860,7 +34661,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +584,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106874,15 +34675,7 @@
  mostlyclean-libtool:
 --- kugar/part/Makefile.in
 +++ kugar/part/Makefile.in
-@@ -175,6 +175,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -312,6 +313,9 @@
+@@ -319,6 +319,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106892,70 +34685,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -370,18 +374,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -436,8 +438,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -460,6 +465,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -541,6 +547,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -557,12 +564,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -625,7 +634,7 @@
+@@ -651,7 +654,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -106964,7 +34694,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +672,9 @@
+@@ -689,9 +692,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -106978,15 +34708,7 @@
  	@$(NORMAL_INSTALL)
 --- kugar/samples/Makefile.in
 +++ kugar/samples/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -106996,70 +34718,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -529,7 +538,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -107068,7 +34727,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -567,9 +576,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107082,15 +34741,7 @@
  mostlyclean-libtool:
 --- kword/data/Makefile.in
 +++ kword/data/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107100,70 +34751,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -107172,7 +34760,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107186,15 +34774,7 @@
  mostlyclean-libtool:
 --- kword/dtd/Makefile.in
 +++ kword/dtd/Makefile.in
-@@ -110,6 +110,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -247,6 +248,9 @@
+@@ -254,6 +254,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107204,70 +34784,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -305,18 +309,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -371,8 +373,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -395,6 +400,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -476,6 +482,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -492,12 +499,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -107276,7 +34793,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107290,15 +34807,7 @@
  mostlyclean-libtool:
 --- kword/expression/Makefile.in
 +++ kword/expression/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107308,70 +34817,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -107380,7 +34826,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107394,15 +34840,7 @@
  mostlyclean-libtool:
 --- kword/horizontalline/Makefile.in
 +++ kword/horizontalline/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107412,70 +34850,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -107484,7 +34859,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107498,15 +34873,7 @@
  mostlyclean-libtool:
 --- kword/mailmerge/kabc/Makefile.in
 +++ kword/mailmerge/kabc/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107516,70 +34883,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -107588,7 +34892,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107602,15 +34906,7 @@
  	@$(NORMAL_INSTALL)
 --- kword/mailmerge/kspread/Makefile.in
 +++ kword/mailmerge/kspread/Makefile.in
-@@ -147,6 +147,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -284,6 +285,9 @@
+@@ -291,6 +291,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107620,70 +34916,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,18 +346,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,8 +410,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -432,6 +437,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -513,6 +519,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -529,12 +536,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -581,7 +590,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -107692,7 +34925,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +628,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107706,15 +34939,7 @@
  	@$(NORMAL_INSTALL)
 --- kword/mailmerge/Makefile.in
 +++ kword/mailmerge/Makefile.in
-@@ -154,6 +154,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -291,6 +292,9 @@
+@@ -298,6 +298,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107724,70 +34949,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,18 +353,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,8 +417,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -439,6 +444,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -520,6 +526,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -536,12 +543,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -107796,7 +34958,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107810,15 +34972,7 @@
  	@$(NORMAL_INSTALL)
 --- kword/mailmerge/sql/Makefile.in
 +++ kword/mailmerge/sql/Makefile.in
-@@ -171,6 +171,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -308,6 +309,9 @@
+@@ -315,6 +315,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107828,70 +34982,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,18 +370,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -432,8 +434,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -456,6 +461,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -537,6 +543,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -553,12 +560,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -622,7 +631,7 @@
+@@ -648,7 +651,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -107900,7 +34991,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +669,9 @@
+@@ -686,9 +689,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -107914,15 +35005,7 @@
  	@$(NORMAL_INSTALL)
 --- kword/Makefile.in
 +++ kword/Makefile.in
-@@ -264,6 +264,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -401,6 +402,9 @@
+@@ -408,6 +408,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -107932,70 +35015,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,18 +463,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -525,8 +527,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -549,6 +554,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -630,6 +636,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -646,12 +653,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -806,7 +815,7 @@
+@@ -832,7 +835,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -108004,7 +35024,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -844,9 +853,9 @@
+@@ -870,9 +873,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108018,15 +35038,7 @@
  	@$(NORMAL_INSTALL)
 --- kword/pics/Makefile.in
 +++ kword/pics/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108036,70 +35048,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -517,7 +526,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -108108,7 +35057,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +564,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108122,15 +35071,7 @@
  mostlyclean-libtool:
 --- kword/templates/CardsAndLabels/Makefile.in
 +++ kword/templates/CardsAndLabels/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108140,70 +35081,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -108212,7 +35090,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108226,15 +35104,7 @@
  mostlyclean-libtool:
 --- kword/templates/Envelopes/Makefile.in
 +++ kword/templates/Envelopes/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108244,70 +35114,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -108316,7 +35123,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108330,15 +35137,7 @@
  mostlyclean-libtool:
 --- kword/templates/Makefile.in
 +++ kword/templates/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108348,70 +35147,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -108420,7 +35156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108434,15 +35170,7 @@
  mostlyclean-libtool:
 --- kword/templates/Wordprocessing/Makefile.in
 +++ kword/templates/Wordprocessing/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108452,70 +35180,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -541,7 +550,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -108524,7 +35189,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +588,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108538,15 +35203,7 @@
  mostlyclean-libtool:
 --- kword/tests/Makefile.in
 +++ kword/tests/Makefile.in
-@@ -141,6 +141,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -278,6 +279,9 @@
+@@ -285,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108556,70 +35213,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,18 +340,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,8 +404,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -426,6 +431,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -507,6 +513,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -523,12 +530,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -580,7 +589,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -108628,7 +35222,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +627,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108642,15 +35236,7 @@
  clean-checkLTLIBRARIES:
 --- kword/toolbar/Makefile.in
 +++ kword/toolbar/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108660,70 +35246,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -108732,7 +35255,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108746,15 +35269,7 @@
  mostlyclean-libtool:
 --- lib/kformula/config/Makefile.in
 +++ lib/kformula/config/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108764,70 +35279,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -552,7 +561,7 @@
+@@ -578,7 +581,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -108836,7 +35288,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +599,9 @@
+@@ -616,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108850,15 +35302,7 @@
  mostlyclean-libtool:
 --- lib/kformula/dtd/Makefile.in
 +++ lib/kformula/dtd/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108868,70 +35312,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -108940,7 +35321,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -108954,15 +35335,7 @@
  mostlyclean-libtool:
 --- lib/kformula/fonts/Makefile.in
 +++ lib/kformula/fonts/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -108972,70 +35345,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -529,7 +538,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -109044,7 +35354,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -567,9 +576,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109058,15 +35368,7 @@
  mostlyclean-libtool:
 --- lib/kformula/Makefile.in
 +++ lib/kformula/Makefile.in
-@@ -183,6 +183,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -320,6 +321,9 @@
+@@ -335,6 +335,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109076,70 +35378,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -378,18 +382,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -444,8 +446,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -468,6 +473,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -549,6 +555,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -565,12 +572,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -632,7 +641,7 @@
+@@ -669,7 +672,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -109148,7 +35387,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -670,9 +679,9 @@
+@@ -707,9 +710,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109162,15 +35401,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kformula/pics/crystalsvg/Makefile.in
 +++ lib/kformula/pics/crystalsvg/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109180,70 +35411,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -109252,7 +35420,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109266,15 +35434,7 @@
  mostlyclean-libtool:
 --- lib/kformula/pics/Makefile.in
 +++ lib/kformula/pics/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109284,70 +35444,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -109356,7 +35453,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109370,15 +35467,7 @@
  mostlyclean-libtool:
 --- lib/kofficecore/Makefile.in
 +++ lib/kofficecore/Makefile.in
-@@ -203,6 +203,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -340,6 +341,9 @@
+@@ -347,6 +347,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109388,70 +35477,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,18 +402,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -464,8 +466,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -488,6 +493,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -569,6 +575,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -585,12 +592,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -712,7 +721,7 @@
+@@ -738,7 +741,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -109460,7 +35486,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -750,9 +759,9 @@
+@@ -776,9 +779,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109474,15 +35500,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kofficecore/tests/Makefile.in
 +++ lib/kofficecore/tests/Makefile.in
-@@ -179,6 +179,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -316,6 +317,9 @@
+@@ -323,6 +323,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109492,70 +35510,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -374,18 +378,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -440,8 +442,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -464,6 +469,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -545,6 +551,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -561,12 +568,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -646,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -109564,7 +35519,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -684,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109578,15 +35533,7 @@
  clean-checkPROGRAMS:
 --- lib/kofficeui/Makefile.in
 +++ lib/kofficeui/Makefile.in
-@@ -182,6 +182,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -319,6 +320,9 @@
+@@ -326,6 +326,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109596,70 +35543,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -377,18 +381,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -443,8 +445,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -467,6 +472,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -548,6 +554,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -564,12 +571,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -675,7 +684,7 @@
+@@ -701,7 +704,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -109668,7 +35552,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -713,9 +722,9 @@
+@@ -739,9 +742,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109682,15 +35566,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kofficeui/pics/Makefile.in
 +++ lib/kofficeui/pics/Makefile.in
-@@ -108,6 +108,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -245,6 +246,9 @@
+@@ -252,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109700,70 +35576,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -303,18 +307,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,8 +371,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -393,6 +398,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -474,6 +480,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -490,12 +497,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -538,7 +547,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -109772,7 +35585,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +585,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109786,15 +35599,7 @@
  mostlyclean-libtool:
 --- lib/kofficeui/tests/Makefile.in
 +++ lib/kofficeui/tests/Makefile.in
-@@ -99,6 +99,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -236,6 +237,9 @@
+@@ -243,6 +243,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109804,70 +35609,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -294,18 +298,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,8 +362,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -384,6 +389,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -465,6 +471,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -481,12 +488,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -524,7 +533,7 @@
+@@ -550,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -109876,7 +35618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +571,9 @@
+@@ -588,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109890,15 +35632,7 @@
  clean-checkPROGRAMS:
 --- lib/kopainter/Makefile.in
 +++ lib/kopainter/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -109908,70 +35642,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -109980,7 +35651,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -109994,15 +35665,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kopalette/Makefile.in
 +++ lib/kopalette/Makefile.in
-@@ -144,6 +144,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -281,6 +282,9 @@
+@@ -288,6 +288,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110012,70 +35675,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,18 +343,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -405,8 +407,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -429,6 +434,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -510,6 +516,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -526,12 +533,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -110084,7 +35684,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110098,15 +35698,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/koproperty/editors/Makefile.in
 +++ lib/koproperty/editors/Makefile.in
-@@ -156,6 +156,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -293,6 +294,9 @@
+@@ -300,6 +300,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110116,70 +35708,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,18 +355,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -417,8 +419,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -441,6 +446,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -522,6 +528,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -538,12 +545,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -110188,7 +35717,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110202,15 +35731,7 @@
  clean-noinstLTLIBRARIES:
 --- lib/koproperty/Makefile.in
 +++ lib/koproperty/Makefile.in
-@@ -155,6 +155,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -292,6 +293,9 @@
+@@ -299,6 +299,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110220,70 +35741,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,18 +354,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -416,8 +418,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -440,6 +445,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -521,6 +527,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -537,12 +544,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -110292,7 +35750,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110306,15 +35764,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/koproperty/test/Makefile.in
 +++ lib/koproperty/test/Makefile.in
-@@ -134,6 +134,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -271,6 +272,9 @@
+@@ -278,6 +278,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110324,70 +35774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,18 +333,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -395,8 +397,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -419,6 +424,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -500,6 +506,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -516,12 +523,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -567,7 +576,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -110396,7 +35783,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +614,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110410,15 +35797,7 @@
  clean-noinstPROGRAMS:
 --- lib/kotext/kohyphen/hyphdicts/Makefile.in
 +++ lib/kotext/kohyphen/hyphdicts/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110428,70 +35807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -529,7 +538,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -110500,7 +35816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -567,9 +576,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110514,15 +35830,7 @@
  mostlyclean-libtool:
 --- lib/kotext/kohyphen/Makefile.in
 +++ lib/kotext/kohyphen/Makefile.in
-@@ -162,6 +162,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -299,6 +300,9 @@
+@@ -306,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110532,70 +35840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -357,18 +361,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -423,8 +425,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -447,6 +452,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -528,6 +534,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -544,12 +551,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -624,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -110604,7 +35849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110618,15 +35863,7 @@
  clean-noinstLTLIBRARIES:
 --- lib/kotext/Makefile.in
 +++ lib/kotext/Makefile.in
-@@ -183,6 +183,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -320,6 +321,9 @@
+@@ -327,6 +327,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110636,70 +35873,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -378,18 +382,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -444,8 +446,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -468,6 +473,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -549,6 +555,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -565,12 +572,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -647,7 +656,7 @@
+@@ -673,7 +676,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -110708,7 +35882,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -685,9 +694,9 @@
+@@ -711,9 +714,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110722,15 +35896,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kotext/tests/Makefile.in
 +++ lib/kotext/tests/Makefile.in
-@@ -149,6 +149,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -286,6 +287,9 @@
+@@ -293,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110740,70 +35906,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,18 +348,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,8 +412,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -434,6 +439,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -515,6 +521,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -531,12 +538,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -110812,7 +35915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110826,15 +35929,7 @@
  clean-checkLTLIBRARIES:
 --- lib/kross/api/Makefile.in
 +++ lib/kross/api/Makefile.in
-@@ -163,6 +163,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -300,6 +301,9 @@
+@@ -307,6 +307,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110844,70 +35939,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -358,18 +362,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -424,8 +426,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -448,6 +453,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -529,6 +535,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -545,12 +552,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -631,7 +640,7 @@
+@@ -655,7 +658,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -110916,7 +35948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +678,9 @@
+@@ -693,9 +696,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -110930,15 +35962,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kross/main/Makefile.in
 +++ lib/kross/main/Makefile.in
-@@ -164,6 +164,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -301,6 +302,9 @@
+@@ -308,6 +308,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -110948,70 +35972,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,18 +363,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -425,8 +427,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -449,6 +454,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -530,6 +536,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -546,12 +553,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -618,7 +627,7 @@
+@@ -644,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -111020,7 +35981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +665,9 @@
+@@ -682,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111034,15 +35995,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kross/Makefile.in
 +++ lib/kross/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111052,70 +36005,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -546,7 +555,7 @@
+@@ -572,7 +575,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -111124,7 +36014,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +593,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111136,17 +36026,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- lib/kross/python/CXX/Makefile.in
-+++ lib/kross/python/CXX/Makefile.in
-@@ -154,6 +154,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -291,6 +292,9 @@
+--- lib/kross/python/cxx/Makefile.in
++++ lib/kross/python/cxx/Makefile.in
+@@ -298,6 +298,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111156,70 +36038,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,18 +353,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,8 +417,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -439,6 +444,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -520,6 +526,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -536,12 +543,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cxx .lo .o .obj
@@ -111228,7 +36047,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111242,15 +36061,7 @@
  clean-noinstLTLIBRARIES:
 --- lib/kross/python/Makefile.in
 +++ lib/kross/python/Makefile.in
-@@ -161,6 +161,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -298,6 +299,9 @@
+@@ -305,6 +305,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111260,70 +36071,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,18 +360,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -422,8 +424,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -446,6 +451,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -527,6 +533,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -543,12 +550,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -111332,7 +36080,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111346,15 +36094,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kross/python/scripts/Makefile.in
 +++ lib/kross/python/scripts/Makefile.in
-@@ -116,6 +116,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -253,6 +254,9 @@
+@@ -260,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111364,70 +36104,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,18 +315,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,8 +379,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -401,6 +406,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -482,6 +488,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -498,12 +505,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -539,7 +548,7 @@
+@@ -565,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -111436,7 +36113,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +586,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111450,15 +36127,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kross/python/scripts/RestrictedPython/Makefile.in
 +++ lib/kross/python/scripts/RestrictedPython/Makefile.in
-@@ -100,6 +100,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -237,6 +238,9 @@
+@@ -244,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111468,70 +36137,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -295,18 +299,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -361,8 +363,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -385,6 +390,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -466,6 +472,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -482,12 +489,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -525,7 +534,7 @@
+@@ -551,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -111540,7 +36146,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -563,9 +572,9 @@
+@@ -589,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111554,15 +36160,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kross/ruby/Makefile.in
 +++ lib/kross/ruby/Makefile.in
-@@ -145,6 +145,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -282,6 +283,9 @@
+@@ -289,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111572,70 +36170,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,18 +344,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,8 +408,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -430,6 +435,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -511,6 +517,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -527,12 +534,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -580,7 +589,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -111644,7 +36179,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +627,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111658,15 +36193,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kross/runner/Makefile.in
 +++ lib/kross/runner/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111676,70 +36203,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -111748,7 +36212,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111762,15 +36226,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/kross/test/Makefile.in
 +++ lib/kross/test/Makefile.in
-@@ -151,6 +151,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -288,6 +289,9 @@
+@@ -295,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111780,70 +36236,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,18 +350,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -412,8 +414,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -436,6 +441,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -517,6 +523,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -533,12 +540,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -111852,7 +36245,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111866,15 +36259,7 @@
  clean-noinstPROGRAMS:
 --- lib/kwmf/Makefile.in
 +++ lib/kwmf/Makefile.in
-@@ -153,6 +153,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -290,6 +291,9 @@
+@@ -297,6 +297,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111884,70 +36269,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,18 +352,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -414,8 +416,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -438,6 +443,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -519,6 +525,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -535,12 +542,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -592,7 +601,7 @@
+@@ -618,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -111956,7 +36278,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +639,9 @@
+@@ -656,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -111970,15 +36292,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/Makefile.in
 +++ lib/Makefile.in
-@@ -114,6 +114,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -251,6 +252,9 @@
+@@ -258,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -111988,70 +36302,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -309,18 +313,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,8 +377,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -399,6 +404,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -480,6 +486,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -496,12 +503,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -570,7 +573,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -112060,7 +36311,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -608,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112074,15 +36325,7 @@
  mostlyclean-libtool:
 --- lib/store/Makefile.in
 +++ lib/store/Makefile.in
-@@ -158,6 +158,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -295,6 +296,9 @@
+@@ -302,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112092,70 +36335,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,18 +357,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,8 +421,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -443,6 +448,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -524,6 +530,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -540,12 +547,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -112164,7 +36344,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112178,15 +36358,7 @@
  	@$(NORMAL_INSTALL)
 --- lib/store/tests/Makefile.in
 +++ lib/store/tests/Makefile.in
-@@ -140,6 +140,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -277,6 +278,9 @@
+@@ -284,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112196,70 +36368,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,18 +339,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,8 +403,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -425,6 +430,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -506,6 +512,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -522,12 +529,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -570,7 +579,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -112268,7 +36377,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +617,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112282,15 +36391,7 @@
  clean-checkPROGRAMS:
 --- Makefile.in
 +++ Makefile.in
-@@ -130,6 +130,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -267,6 +268,9 @@
+@@ -274,6 +274,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112300,70 +36401,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -325,18 +329,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,8 +393,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -415,6 +420,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -496,6 +502,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -512,12 +519,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -564,7 +573,7 @@
+@@ -590,7 +593,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -112372,7 +36410,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,12 +615,12 @@
+@@ -632,12 +635,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -112387,7 +36425,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -623,7 +632,7 @@
+@@ -649,7 +652,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -112396,26 +36434,18 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -1133,7 +1142,7 @@
+@@ -1159,7 +1162,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=koffice.lsm Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp changes-1.4 configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in 
-+KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp changes-1.4 configure.in.in configure Makefile.am acinclude.m4 changes-1.5 Makefile.am.in 
+-KDE_DIST=koffice.lsm Mainpage.dox README.APPS subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp changes-1.4 configure.in.in Makefile.am acinclude.m4 changes-1.5 Makefile.am.in 
++KDE_DIST=koffice.lsm stamp-h.in Mainpage.dox README.APPS subdirs Makefile.in configure.files config.h.in vpat_koffice1.4.1.sxw README.PACKAGERS configure.in Makefile.cvs aclocal.m4 Doxyfile.temp changes-1.4 configure.in.in acinclude.m4 configure Makefile.am changes-1.5 Makefile.am.in 
  
  #>+ 2
  docs-am:
 --- mimetypes/kde33/Makefile.in
 +++ mimetypes/kde33/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112425,70 +36455,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -541,7 +550,7 @@
+@@ -567,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -112497,7 +36464,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +588,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112511,15 +36478,7 @@
  mostlyclean-libtool:
 --- mimetypes/kde351/Makefile.in
 +++ mimetypes/kde351/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112529,70 +36488,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -529,7 +538,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -112601,7 +36497,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -567,9 +576,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112615,15 +36511,7 @@
  mostlyclean-libtool:
 --- mimetypes/Makefile.in
 +++ mimetypes/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112633,70 +36521,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -535,7 +544,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -112705,7 +36530,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +582,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112719,15 +36544,7 @@
  mostlyclean-libtool:
 --- pics/crystalsvg/Makefile.in
 +++ pics/crystalsvg/Makefile.in
-@@ -96,6 +96,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -233,6 +234,9 @@
+@@ -240,6 +240,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112737,70 +36554,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -291,18 +295,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -357,8 +359,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -381,6 +386,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -462,6 +468,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -478,12 +485,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -518,7 +527,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -112809,7 +36563,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +565,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112821,17 +36575,31 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -853,9 +856,9 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-newslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-tab_first.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_edit.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-delslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-action-fontsizedown.png $(DESTDIR)$(kofficedir)/crystalsvg/48x48/actions/fontsizedown.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-view_remove.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/view_remove.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-delslide.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-aotop.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kdb_table.png $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-frame_image.png $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
+@@ -991,9 +994,9 @@
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/newslide.png
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/tab_first.png
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_edit.png
++	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/48x48/actions/fontsizedown.png
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/view_remove.png
+-	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/delslide.png
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/aotop.png
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/16x16/actions/kdb_table.png
+ 	-rm -f $(DESTDIR)$(kofficedir)/crystalsvg/22x22/actions/frame_image.png
 --- pics/Makefile.in
 +++ pics/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112841,70 +36609,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -112913,7 +36618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -112927,15 +36632,7 @@
  mostlyclean-libtool:
 --- plugins/Makefile.in
 +++ plugins/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -112945,70 +36642,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -113017,7 +36651,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113031,15 +36665,7 @@
  mostlyclean-libtool:
 --- plugins/scan/Makefile.in
 +++ plugins/scan/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113049,70 +36675,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -581,7 +590,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -113121,7 +36684,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +628,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113135,15 +36698,7 @@
  	@$(NORMAL_INSTALL)
 --- servicetypes/Makefile.in
 +++ servicetypes/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113153,70 +36708,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -530,7 +539,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -113225,7 +36717,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -568,9 +577,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113239,15 +36731,7 @@
  mostlyclean-libtool:
 --- templates/Makefile.in
 +++ templates/Makefile.in
-@@ -107,6 +107,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -244,6 +245,9 @@
+@@ -251,6 +251,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113257,70 +36741,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -302,18 +306,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,8 +370,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -392,6 +397,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -473,6 +479,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -489,12 +496,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -531,7 +540,7 @@
+@@ -557,7 +560,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -113329,7 +36750,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -569,9 +578,9 @@
+@@ -595,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113343,15 +36764,7 @@
  mostlyclean-libtool:
 --- tools/converter/Makefile.in
 +++ tools/converter/Makefile.in
-@@ -130,6 +130,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -267,6 +268,9 @@
+@@ -274,6 +274,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113361,70 +36774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -325,18 +329,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,8 +393,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -415,6 +420,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -496,6 +502,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -512,12 +519,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -556,7 +565,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -113433,7 +36783,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +603,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113447,15 +36797,7 @@
  	@$(NORMAL_INSTALL)
 --- tools/kfile-plugins/abiword/Makefile.in
 +++ tools/kfile-plugins/abiword/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113465,70 +36807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -113537,7 +36816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113551,15 +36830,7 @@
  	@$(NORMAL_INSTALL)
 --- tools/kfile-plugins/gnumeric/Makefile.in
 +++ tools/kfile-plugins/gnumeric/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113569,70 +36840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -113641,7 +36849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113655,15 +36863,7 @@
  	@$(NORMAL_INSTALL)
 --- tools/kfile-plugins/koffice/Makefile.in
 +++ tools/kfile-plugins/koffice/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113673,70 +36873,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -113745,7 +36882,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113759,15 +36896,7 @@
  	@$(NORMAL_INSTALL)
 --- tools/kfile-plugins/Makefile.in
 +++ tools/kfile-plugins/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113777,70 +36906,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -113849,7 +36915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113863,15 +36929,7 @@
  mostlyclean-libtool:
 --- tools/kfile-plugins/ooo/Makefile.in
 +++ tools/kfile-plugins/ooo/Makefile.in
-@@ -142,6 +142,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -279,6 +280,9 @@
+@@ -286,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113881,70 +36939,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,18 +341,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,8 +405,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -427,6 +432,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -508,6 +514,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -524,12 +531,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -578,7 +587,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -113953,7 +36948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +625,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -113967,15 +36962,7 @@
  	@$(NORMAL_INSTALL)
 --- tools/kthesaurus/Makefile.in
 +++ tools/kthesaurus/Makefile.in
-@@ -155,6 +155,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -292,6 +293,9 @@
+@@ -299,6 +299,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -113985,70 +36972,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,18 +354,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -416,8 +418,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -440,6 +445,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -521,6 +527,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -537,12 +544,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -114057,7 +36981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -114071,15 +36995,7 @@
  	@$(NORMAL_INSTALL)
 --- tools/Makefile.in
 +++ tools/Makefile.in
-@@ -112,6 +112,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -249,6 +250,9 @@
+@@ -256,6 +256,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -114089,70 +37005,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -307,18 +311,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,8 +375,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -397,6 +402,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -478,6 +484,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -494,12 +501,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -533,7 +542,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -114161,7 +37014,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +580,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -114175,15 +37028,7 @@
  mostlyclean-libtool:
 --- tools/quickprint/Makefile.in
 +++ tools/quickprint/Makefile.in
-@@ -106,6 +106,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -243,6 +244,9 @@
+@@ -250,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -114193,70 +37038,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,18 +305,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,8 +369,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -391,6 +396,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -472,6 +478,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -488,12 +495,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -528,7 +537,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -114265,7 +37047,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +575,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -114279,15 +37061,7 @@
  mostlyclean-libtool:
 --- tools/spell/Makefile.in
 +++ tools/spell/Makefile.in
-@@ -116,6 +116,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -253,6 +254,9 @@
+@@ -260,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -114297,70 +37071,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,18 +315,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,8 +379,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -401,6 +406,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -482,6 +488,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -498,12 +505,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -536,7 +545,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -114369,7 +37080,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +583,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -114383,15 +37094,7 @@
  mostlyclean-libtool:
 --- tools/thesaurus/Makefile.in
 +++ tools/thesaurus/Makefile.in
-@@ -143,6 +143,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -280,6 +281,9 @@
+@@ -287,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -114401,70 +37104,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -338,18 +342,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,8 +406,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -428,6 +433,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -509,6 +515,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -525,12 +532,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -114473,7 +37113,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -114487,15 +37127,7 @@
  	@$(NORMAL_INSTALL)
 --- tools/thumbnail/Makefile.in
 +++ tools/thumbnail/Makefile.in
-@@ -146,6 +146,7 @@
- GLINC = @GLINC@
- GLLIB = @GLLIB@
- GMSGFMT = @GMSGFMT@
-+GREP = @GREP@
- HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
- INC_KFEEDBACK = @INC_KFEEDBACK@
- INSTALL_DATA = @INSTALL_DATA@
-@@ -283,6 +284,9 @@
+@@ -290,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -114505,70 +37137,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,18 +345,16 @@
- VERSION = @VERSION@
- WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
- XGETTEXT = @XGETTEXT@
-+XMKMF = @XMKMF@
- XMLLINT = @XMLLINT@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_INCLUDES = @X_INCLUDES@
- X_LDFLAGS = @X_LDFLAGS@
- X_PRE_LIBS = @X_PRE_LIBS@
- X_RPATH = @X_RPATH@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- all_includes = @all_includes@
- all_libraries = @all_libraries@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,8 +409,11 @@
- compile_plugin_KUGAR_FALSE = @compile_plugin_KUGAR_FALSE@
- compile_plugin_KUGAR_TRUE = @compile_plugin_KUGAR_TRUE@
- datadir = @datadir@
-+datarootdir = @datarootdir@
- doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
- doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+docdir = @docdir@
-+dvidir = @dvidir@
- example_SUBDIR_included_FALSE = @example_SUBDIR_included_FALSE@
- example_SUBDIR_included_TRUE = @example_SUBDIR_included_TRUE@
- exec_prefix = @exec_prefix@
-@@ -431,6 +436,7 @@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- include_ARTS_FALSE = @include_ARTS_FALSE@
- include_ARTS_TRUE = @include_ARTS_TRUE@
- include_XSLTFILTERS_FALSE = @include_XSLTFILTERS_FALSE@
-@@ -512,6 +518,7 @@
- lib_SUBDIR_included_TRUE = @lib_SUBDIR_included_TRUE@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mimetypes_SUBDIR_included_FALSE = @mimetypes_SUBDIR_included_FALSE@
-@@ -528,12 +535,14 @@
- need_kde351_compatibility_FALSE = @need_kde351_compatibility_FALSE@
- need_kde351_compatibility_TRUE = @need_kde351_compatibility_TRUE@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
- pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
- plugins_SUBDIR_included_FALSE = @plugins_SUBDIR_included_FALSE@
- plugins_SUBDIR_included_TRUE = @plugins_SUBDIR_included_TRUE@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -114577,7 +37146,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  




More information about the pkg-kde-commits mailing list