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

Pierre Habouzit madcoder at costa.debian.org
Mon May 29 08:17:18 UTC 2006


Author: madcoder
Date: 2006-05-29 08:14:40 +0000 (Mon, 29 May 2006)
New Revision: 3836

Modified:
   trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
buildprep my friend :|



Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-05-29 07:56:38 UTC (rev 3835)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-05-29 08:14:40 UTC (rev 3836)
@@ -28,7 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5970,30 +5958,15 @@
+@@ -5973,30 +5961,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)
-@@ -6053,7 +6026,7 @@
+@@ -6056,7 +6029,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -73,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6103,7 +6076,7 @@
+@@ -6106,7 +6079,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.
-@@ -6123,7 +6096,7 @@
+@@ -6126,7 +6099,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -91,7 +91,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6143,6 +6116,7 @@
+@@ -6146,6 +6119,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"
-@@ -6162,15 +6136,17 @@
+@@ -6165,15 +6139,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*)
-@@ -6211,11 +6187,56 @@
+@@ -6214,11 +6190,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
-@@ -6288,15 +6309,15 @@
+@@ -6291,15 +6312,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
-@@ -6465,14 +6486,13 @@
+@@ -6468,14 +6489,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*)
-@@ -6484,7 +6504,6 @@
+@@ -6487,7 +6507,6 @@
        esac
        ;;
      *64-bit*)
@@ -220,7 +220,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6518,6 +6537,22 @@
+@@ -6521,6 +6540,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)
-@@ -6549,7 +6584,7 @@
+@@ -6552,7 +6587,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)
-@@ -6559,8 +6594,10 @@
+@@ -6562,8 +6597,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
-@@ -6586,11 +6623,16 @@
+@@ -6589,11 +6626,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
-@@ -6614,7 +6656,7 @@
+@@ -6617,7 +6659,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*)
-@@ -6643,20 +6685,70 @@
+@@ -6646,20 +6688,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.
-@@ -6673,7 +6765,7 @@
+@@ -6676,7 +6768,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
-@@ -6681,7 +6773,7 @@
+@@ -6684,7 +6776,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 :
-@@ -6747,17 +6839,19 @@
+@@ -6750,17 +6842,19 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -409,7 +409,7 @@
      esac
    else :
      # compilation failed
-@@ -6769,7 +6863,7 @@
+@@ -6772,7 +6866,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
-@@ -6806,7 +6900,7 @@
+@@ -6809,7 +6903,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -427,7 +427,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6840,7 +6934,7 @@
+@@ -6843,7 +6937,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"
-@@ -6853,7 +6947,7 @@
+@@ -6856,7 +6950,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(
-@@ -6895,20 +6989,13 @@
+@@ -6898,20 +6992,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)
-@@ -6920,13 +7007,18 @@
+@@ -6923,13 +7010,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*
-@@ -6985,8 +7077,8 @@
+@@ -6988,8 +7080,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 &&
-@@ -7043,7 +7135,7 @@
+@@ -7046,7 +7138,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -510,7 +510,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -7056,7 +7148,7 @@
+@@ -7059,7 +7151,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -519,7 +519,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -7066,7 +7158,20 @@
+@@ -7069,7 +7161,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
  
-@@ -7131,7 +7236,7 @@
+@@ -7134,7 +7239,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -550,7 +550,7 @@
    ;;
  
  beos*)
-@@ -7140,7 +7245,7 @@
+@@ -7143,7 +7248,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}'
-@@ -7156,7 +7261,7 @@
+@@ -7159,7 +7264,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -568,7 +568,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7168,7 +7273,8 @@
+@@ -7171,7 +7276,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'
-@@ -7198,7 +7304,7 @@
+@@ -7201,7 +7307,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -587,7 +587,7 @@
        ;;
      esac
      ;;
-@@ -7221,7 +7327,7 @@
+@@ -7224,7 +7330,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"`
-@@ -7244,20 +7350,17 @@
+@@ -7247,20 +7353,17 @@
    dynamic_linker=no
    ;;
  
@@ -628,7 +628,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7275,14 +7378,19 @@
+@@ -7278,14 +7381,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -650,7 +650,7 @@
    esac
    ;;
  
-@@ -7302,9 +7410,9 @@
+@@ -7305,9 +7413,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -662,7 +662,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7319,7 +7427,7 @@
+@@ -7322,7 +7430,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -671,7 +671,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7330,7 +7438,7 @@
+@@ -7333,7 +7441,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -680,7 +680,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7342,6 +7450,18 @@
+@@ -7345,6 +7453,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -699,7 +699,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -7385,29 +7505,26 @@
+@@ -7388,29 +7508,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -736,7 +736,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,
-@@ -7417,6 +7534,18 @@
+@@ -7420,6 +7537,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -755,7 +755,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7426,7 +7555,7 @@
+@@ -7429,7 +7558,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -764,7 +764,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7454,8 +7583,13 @@
+@@ -7457,8 +7586,13 @@
  
  openbsd*)
    version_type=sunos
@@ -779,7 +779,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
-@@ -7475,7 +7609,7 @@
+@@ -7478,7 +7612,7 @@
  
  os2*)
    libname_spec='$name'
@@ -788,7 +788,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7493,13 +7627,6 @@
+@@ -7496,13 +7630,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -802,7 +802,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -7525,7 +7652,7 @@
+@@ -7528,7 +7655,7 @@
    need_version=yes
    ;;
  
@@ -811,7 +811,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'
-@@ -7558,6 +7685,29 @@
+@@ -7561,6 +7688,29 @@
    fi
    ;;
  
@@ -841,7 +841,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -7571,6 +7721,11 @@
+@@ -7574,6 +7724,11 @@
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -853,7 +853,7 @@
  ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
  
  
-@@ -7595,6 +7750,9 @@
+@@ -7598,6 +7753,9 @@
        AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
      fi
    fi
@@ -863,7 +863,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -7621,7 +7779,9 @@
+@@ -7624,7 +7782,9 @@
  
        case $tagname in
        CXX)
@@ -874,7 +874,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7683,7 +7843,7 @@
+@@ -7686,7 +7846,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -883,7 +883,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7721,7 +7881,7 @@
+@@ -7724,7 +7884,7 @@
  
  # AC_DISABLE_SHARED
  # -----------------
@@ -892,7 +892,7 @@
  AC_DEFUN([AC_DISABLE_SHARED],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
  AC_ENABLE_SHARED(no)
-@@ -7857,7 +8017,7 @@
+@@ -7860,7 +8020,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -901,7 +901,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
-@@ -7967,7 +8127,7 @@
+@@ -7970,7 +8130,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,
@@ -910,7 +910,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'*)
-@@ -7999,7 +8159,7 @@
+@@ -8002,7 +8162,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,
@@ -919,7 +919,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -8026,6 +8186,15 @@
+@@ -8029,6 +8189,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -935,7 +935,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -8059,44 +8228,36 @@
+@@ -8062,44 +8231,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -991,7 +991,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -8112,7 +8273,7 @@
+@@ -8115,7 +8276,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -1000,7 +1000,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
-@@ -8128,43 +8289,27 @@
+@@ -8131,43 +8292,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
-@@ -8183,32 +8328,22 @@
+@@ -8186,32 +8331,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]]'
-@@ -8229,10 +8364,13 @@
+@@ -8232,10 +8367,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1108,7 +1108,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -8252,36 +8390,43 @@
+@@ -8255,36 +8393,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"
-@@ -8313,13 +8458,13 @@
+@@ -8316,13 +8461,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
-@@ -8338,13 +8483,13 @@
+@@ -8341,13 +8486,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
-@@ -8382,10 +8527,21 @@
+@@ -8385,10 +8530,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1241,7 +1241,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8425,7 +8581,7 @@
+@@ -8428,7 +8584,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])
-@@ -8458,36 +8614,9 @@
+@@ -8461,36 +8617,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1290,7 +1290,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -8501,9 +8630,9 @@
+@@ -8504,9 +8633,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])
  
-@@ -8512,7 +8641,7 @@
+@@ -8515,7 +8644,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
-@@ -8521,48 +8650,11 @@
+@@ -8524,48 +8653,11 @@
    fi
    ;;
  
@@ -1362,7 +1362,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8587,7 +8679,7 @@
+@@ -8590,7 +8682,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)=
-@@ -8599,6 +8691,7 @@
+@@ -8602,6 +8694,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)=
-@@ -8616,7 +8709,7 @@
+@@ -8619,7 +8712,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
-@@ -8626,11 +8719,15 @@
+@@ -8629,11 +8722,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
-@@ -8641,18 +8738,18 @@
+@@ -8644,18 +8741,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
-@@ -8670,8 +8767,8 @@
+@@ -8673,8 +8770,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'
-@@ -8697,7 +8794,7 @@
+@@ -8700,7 +8797,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
-@@ -8727,8 +8824,23 @@
+@@ -8730,8 +8827,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1473,7 +1473,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8745,7 +8857,7 @@
+@@ -8748,7 +8860,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`
-@@ -8764,8 +8876,12 @@
+@@ -8767,8 +8879,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
-@@ -8774,15 +8890,16 @@
+@@ -8777,15 +8893,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.
-@@ -8791,13 +8908,12 @@
+@@ -8794,13 +8911,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
-@@ -8806,22 +8922,32 @@
+@@ -8809,22 +8925,32 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1576,7 +1576,7 @@
      esac
      ;;
  
-@@ -8829,12 +8955,12 @@
+@@ -8832,12 +8958,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'
@@ -1591,7 +1591,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
-@@ -8843,70 +8969,81 @@
+@@ -8846,70 +8972,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1725,7 +1725,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8917,14 +9054,14 @@
+@@ -8920,14 +9057,14 @@
  	;;
      esac
      ;;
@@ -1742,7 +1742,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8941,12 +9078,12 @@
+@@ -8944,12 +9081,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1758,7 +1758,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8955,11 +9092,11 @@
+@@ -8958,11 +9095,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.
@@ -1772,7 +1772,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8969,34 +9106,23 @@
+@@ -8972,34 +9109,23 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1814,7 +1814,7 @@
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-@@ -9006,17 +9132,20 @@
+@@ -9009,17 +9135,20 @@
      esac
  
      case $cc_basename in
@@ -1841,7 +1841,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -9032,12 +9161,15 @@
+@@ -9035,12 +9164,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1861,7 +1861,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -9048,11 +9180,25 @@
+@@ -9051,11 +9183,25 @@
  	;;
      esac
      ;;
@@ -1889,7 +1889,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -9063,9 +9209,9 @@
+@@ -9066,9 +9212,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1901,7 +1901,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -9074,16 +9220,16 @@
+@@ -9077,16 +9223,16 @@
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
      ;;
@@ -1922,7 +1922,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -9101,20 +9247,44 @@
+@@ -9104,20 +9250,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1973,7 +1973,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9142,7 +9312,7 @@
+@@ -9145,7 +9315,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1982,7 +1982,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9152,7 +9322,7 @@
+@@ -9155,7 +9325,7 @@
  	;;
      esac
      ;;
@@ -1991,7 +1991,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=
-@@ -9163,15 +9333,31 @@
+@@ -9166,15 +9336,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::"'
      ;;
@@ -2025,7 +2025,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9181,14 +9367,14 @@
+@@ -9184,14 +9370,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -2043,7 +2043,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9206,7 +9392,7 @@
+@@ -9209,7 +9395,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2052,7 +2052,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9225,13 +9411,13 @@
+@@ -9228,13 +9414,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -2068,7 +2068,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9240,17 +9426,17 @@
+@@ -9243,17 +9429,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -2090,7 +2090,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9269,7 +9455,7 @@
+@@ -9272,7 +9458,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -2099,7 +2099,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9290,27 +9476,14 @@
+@@ -9293,27 +9479,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -2129,7 +2129,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9323,36 +9496,33 @@
+@@ -9326,36 +9499,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -2178,7 +2178,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9360,9 +9530,9 @@
+@@ -9363,9 +9533,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -2190,7 +2190,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9372,9 +9542,9 @@
+@@ -9375,9 +9545,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
@@ -2202,7 +2202,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9383,9 +9553,9 @@
+@@ -9386,9 +9556,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -2214,7 +2214,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9398,12 +9568,63 @@
+@@ -9401,12 +9571,63 @@
  	;;
      esac
      ;;
@@ -2280,7 +2280,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9440,8 +9661,6 @@
+@@ -9443,8 +9664,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2289,7 +2289,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9459,7 +9678,7 @@
+@@ -9462,7 +9681,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2298,7 +2298,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -9513,7 +9732,7 @@
+@@ -9516,7 +9735,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.
@@ -2307,7 +2307,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9553,7 +9772,7 @@
+@@ -9556,7 +9775,7 @@
         fi
         ;;
  
@@ -2316,7 +2316,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9589,13 +9808,37 @@
+@@ -9592,13 +9811,37 @@
  
  $rm -f confest.$objext
  
@@ -2355,7 +2355,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'.
-@@ -9639,12 +9882,16 @@
+@@ -9642,12 +9885,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2373,7 +2373,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9654,7 +9901,7 @@
+@@ -9657,7 +9904,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2382,7 +2382,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9662,8 +9909,10 @@
+@@ -9665,8 +9912,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2395,7 +2395,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9673,8 +9922,6 @@
+@@ -9676,8 +9925,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2404,7 +2404,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -9684,8 +9931,6 @@
+@@ -9687,8 +9934,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2413,7 +2413,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9714,20 +9959,27 @@
+@@ -9717,20 +9962,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2442,7 +2442,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
-@@ -9739,8 +9991,6 @@
+@@ -9742,8 +9994,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2451,7 +2451,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -9750,7 +10000,7 @@
+@@ -9753,7 +10003,7 @@
  
  
  # AC_LIBTOOL_LANG_RC_CONFIG
@@ -2460,7 +2460,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'.
-@@ -9774,11 +10024,16 @@
+@@ -9777,11 +10027,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2477,7 +2477,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9804,11 +10059,12 @@
+@@ -9807,11 +10062,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2492,7 +2492,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 \
-@@ -9858,7 +10114,7 @@
+@@ -9861,7 +10117,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2501,7 +2501,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9924,11 +10180,11 @@
+@@ -9927,11 +10183,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2515,7 +2515,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9959,6 +10215,12 @@
+@@ -9962,6 +10218,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2528,7 +2528,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9970,6 +10232,9 @@
+@@ -9973,6 +10235,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2538,7 +2538,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -9989,7 +10254,7 @@
+@@ -9992,7 +10257,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2547,7 +2547,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -10020,7 +10285,7 @@
+@@ -10023,7 +10288,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2556,7 +2556,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10035,7 +10300,7 @@
+@@ -10038,7 +10303,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2565,7 +2565,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10264,7 +10529,10 @@
+@@ -10267,7 +10532,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.
@@ -2577,7 +2577,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10306,9 +10574,6 @@
+@@ -10309,9 +10577,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2587,7 +2587,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'"
  
-@@ -10330,14 +10595,30 @@
+@@ -10333,14 +10598,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'"
    ;;
@@ -2620,7 +2620,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10355,14 +10636,17 @@
+@@ -10358,14 +10639,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2640,7 +2640,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10518,6 +10802,10 @@
+@@ -10521,6 +10805,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2651,7 +2651,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -10526,7 +10814,7 @@
+@@ -10529,7 +10817,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2660,7 +2660,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10551,18 +10839,28 @@
+@@ -10554,18 +10842,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2692,7 +2692,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10570,22 +10868,22 @@
+@@ -10573,22 +10871,22 @@
  	    ;;
  	esac
  	;;
@@ -2721,7 +2721,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10598,9 +10896,13 @@
+@@ -10601,9 +10899,13 @@
  	    ;;
  	esac
  	;;
@@ -2736,7 +2736,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.
-@@ -10609,20 +10911,26 @@
+@@ -10612,20 +10914,26 @@
  	    ;;
  	esac
  	;;
@@ -2768,7 +2768,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10639,25 +10947,25 @@
+@@ -10642,25 +10950,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2799,7 +2799,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
-@@ -10671,24 +10979,15 @@
+@@ -10674,24 +10982,15 @@
  	;;
        psos*)
  	;;
@@ -2826,7 +2826,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10698,12 +10997,12 @@
+@@ -10701,12 +11000,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2841,7 +2841,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10713,7 +11012,7 @@
+@@ -10716,7 +11015,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2850,7 +2850,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10721,7 +11020,14 @@
+@@ -10724,7 +11023,14 @@
  	    ;;
  	esac
  	;;
@@ -2866,7 +2866,7 @@
  	;;
        vxworks*)
  	;;
-@@ -10768,6 +11074,11 @@
+@@ -10771,6 +11077,11 @@
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
        ;;
  
@@ -2878,7 +2878,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -10784,7 +11095,7 @@
+@@ -10787,7 +11098,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2887,7 +2887,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10810,6 +11121,16 @@
+@@ -10813,6 +11124,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2904,7 +2904,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10821,7 +11142,7 @@
+@@ -10824,7 +11145,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.
@@ -2913,7 +2913,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10844,13 +11165,20 @@
+@@ -10847,13 +11168,20 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2936,7 +2936,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10865,15 +11193,15 @@
+@@ -10868,15 +11196,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2958,7 +2958,7 @@
        ;;
  
      sunos4*)
-@@ -10882,7 +11210,7 @@
+@@ -10885,7 +11213,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2967,7 +2967,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'
-@@ -10895,6 +11223,17 @@
+@@ -10898,6 +11226,17 @@
        fi
        ;;
  
@@ -2985,7 +2985,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10922,7 +11261,7 @@
+@@ -10925,7 +11264,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2994,7 +2994,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10931,6 +11270,16 @@
+@@ -10934,6 +11273,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
@@ -3011,7 +3011,7 @@
  ])
  
  
-@@ -10955,7 +11304,10 @@
+@@ -10958,7 +11307,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -3023,7 +3023,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10981,7 +11333,7 @@
+@@ -10984,7 +11336,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -3032,7 +3032,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*
-@@ -10998,7 +11350,8 @@
+@@ -11001,7 +11353,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -3042,7 +3042,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -11008,6 +11361,10 @@
+@@ -11011,6 +11364,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -3053,7 +3053,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -11018,6 +11375,27 @@
+@@ -11021,6 +11378,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -3081,7 +3081,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -11055,7 +11433,7 @@
+@@ -11058,7 +11436,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
@@ -3090,7 +3090,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -11065,13 +11443,13 @@
+@@ -11068,13 +11446,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'
@@ -3107,7 +3107,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
-@@ -11080,23 +11458,70 @@
+@@ -11083,23 +11461,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -3184,7 +3184,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<EOF 1>&2
-@@ -11110,13 +11535,40 @@
+@@ -11113,13 +11538,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3227,7 +3227,7 @@
      sunos4*)
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -11126,24 +11578,19 @@
+@@ -11129,24 +11581,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3259,7 +3259,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11155,7 +11602,7 @@
+@@ -11158,7 +11605,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
@@ -3268,7 +3268,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -11177,9 +11624,21 @@
+@@ -11180,9 +11627,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
@@ -3292,7 +3292,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11196,7 +11655,7 @@
+@@ -11199,7 +11658,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3301,7 +3301,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`
-@@ -11215,8 +11674,12 @@
+@@ -11218,8 +11677,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3314,7 +3314,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11224,30 +11687,30 @@
+@@ -11227,30 +11690,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3356,7 +3356,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11256,13 +11719,11 @@
+@@ -11259,13 +11722,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'
@@ -3373,7 +3373,7 @@
  	fi
        fi
        ;;
-@@ -11275,7 +11736,7 @@
+@@ -11278,7 +11739,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3382,7 +3382,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11285,69 +11746,69 @@
+@@ -11288,69 +11749,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -3498,7 +3498,7 @@
        ;;
  
      dgux*)
-@@ -11380,8 +11841,8 @@
+@@ -11383,8 +11844,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3509,7 +3509,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11850,7 @@
+@@ -11392,7 +11853,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -3518,7 +3518,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
-@@ -11403,47 +11864,62 @@
+@@ -11406,47 +11867,62 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        ;;
  
@@ -3605,7 +3605,7 @@
  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
-@@ -11457,7 +11933,7 @@
+@@ -11460,7 +11936,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -3614,7 +3614,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'
-@@ -11467,7 +11943,7 @@
+@@ -11470,7 +11946,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -3623,7 +3623,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
-@@ -11490,7 +11966,8 @@
+@@ -11493,7 +11969,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
@@ -3633,7 +3633,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11500,7 +11977,7 @@
+@@ -11503,7 +11980,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -3642,7 +3642,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11511,14 +11988,14 @@
+@@ -11514,14 +11991,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
@@ -3659,7 +3659,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'
-@@ -11530,13 +12007,13 @@
+@@ -11533,13 +12010,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}\*'
@@ -3675,7 +3675,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11544,21 +12021,15 @@
+@@ -11547,21 +12024,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3701,7 +3701,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'
-@@ -11567,8 +12038,18 @@
+@@ -11570,8 +12041,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3722,7 +3722,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11577,7 +12058,7 @@
+@@ -11580,7 +12061,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.
@@ -3731,7 +3731,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11625,36 +12106,45 @@
+@@ -11628,36 +12109,45 @@
        fi
        ;;
  
@@ -3798,7 +3798,7 @@
        ;;
  
      uts4*)
-@@ -11672,11 +12162,6 @@
+@@ -11675,11 +12165,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3810,7 +3810,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -11697,13 +12182,14 @@
+@@ -11700,13 +12185,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3826,7 +3826,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -11831,7 +12317,7 @@
+@@ -11834,7 +12320,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
@@ -3835,47 +3835,17 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
- # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- applnk/compat/Makefile.in
 +++ applnk/compat/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -263,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3885,7 +3855,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -313,6 +317,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -320,12 +325,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,10 +348,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -358,6 +363,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -519,6 +525,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -526,10 +533,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -3894,7 +3928,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3906,18 +3940,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -760,7 +763,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop Makefile.am power.desktop 
-+KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop power.desktop Makefile.am 
- 
- #>+ 2
- docs-am:
 --- applnk/Makefile.in
 +++ applnk/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -280,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3927,7 +3960,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -330,6 +334,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -337,12 +342,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -363,10 +365,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -375,6 +380,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -536,6 +542,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -543,10 +550,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -569,7 +578,7 @@
  SUBDIRS = compat
  xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
  xdg_mergedmenu_DATA = kde-essential.menu
@@ -3936,7 +4033,7 @@
  xdg_directory_DATA = \
  kde-main.directory \
  kde-development.directory \
-@@ -624,7 +627,7 @@
+@@ -624,7 +633,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -3945,7 +4042,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -662,9 +665,9 @@
+@@ -662,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3957,19 +4054,712 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -1027,7 +1030,7 @@
+@@ -1027,7 +1036,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-utilities-file.directory kde-games-arcade.directory kde-games.directory kde-settings-accessibility.directory kde-settings-security.directory kde-utilities-accessibility.directory kde-settings-network.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-toys.directory kde-system-screensavers.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-peripherals.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory 
-+KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-utilities-file.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-utilities-accessibility.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-development.directory kde-games-card.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory kde-graphics.directory hidden.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-utilities-peripherals.directory kde-settings.directory kde-science.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory kde-multimedia.directory Makefile.am kde-games-strategy.directory kde-settings-peripherals.directory 
++KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-utilities-file.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-utilities-accessibility.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-office.directory kde-information.menu kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-system.directory kde-settings-hardware.directory kde-graphics.directory hidden.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-peripherals.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory 
  
  #>+ 2
  docs-am:
+--- config.h.in
++++ config.h.in
+@@ -212,10 +212,14 @@
+ /* Define to 1 if you have the `login_getclass' function. */
+ #undef HAVE_LOGIN_GETCLASS
+ 
+-/* Define to 1 if long double works and has more range or precision than
+-   double. */
++/* Define to 1 if the type `long double' works and has more range or precision
++   than `double'. */
+ #undef HAVE_LONG_DOUBLE
+ 
++/* Define to 1 if the type `long double' works and has more range or precision
++   than `double'. */
++#undef HAVE_LONG_DOUBLE_WIDER
++
+ /* Define if you have long long as datatype */
+ #undef HAVE_LONG_LONG
+ 
+@@ -662,25 +666,25 @@
+ /* Define if kdm should use Sun's secure RPC for Xauth cookies. */
+ #undef SECURE_RPC
+ 
+-/* The size of a `char', as computed by sizeof. */
++/* The size of `char', as computed by sizeof. */
+ #undef SIZEOF_CHAR
+ 
+-/* 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
-@@ -278,15 +278,15 @@
+@@ -1,8 +1,9 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.59d.
+ #
+-# 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
  
++
++# 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 (dirname -- /) >/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
@@ -3987,16 +4777,992 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -464,7 +464,7 @@
+@@ -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,526 @@
+ #endif
+ #if 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
  # include <unistd.h>
  #endif"
  
 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE install_usbids_TRUE install_usbids_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS KHOTKEYS_ARTS_SUBDIR LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME 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 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE install_usbids_TRUE install_usbids_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS KHOTKEYS_ARTS_SUBDIR LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL
++PATH_SEPARATOR
++PACKAGE_NAME
++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
++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
++PAMLIBS
++LIBSHADOW
++LIBGEN
++SETUIDFLAGS
++PASSWDLIBS
++KDM_PAM_SERVICE
++KCHECKPASS_PAM_SERVICE
++KSCREENSAVER_PAM_SERVICE
++LIBALIB
++LIBRPC
++LIBOSSAUDIO
++LIBCFG
++LIBODM
++LIBCURSES
++LIBUTEMPTER
++LIBKSTAT
++LIBDEVINFO
++JAVAC
++JAVAH
++JAR
++JVMLIBS
++jni_includes
++MD5SUM
++MD5SUM_CUT
++XTESTLIB
++LIB_XCURSOR
++have_xcursor_TRUE
++have_xcursor_FALSE
++QTDOCDIR
++KDE_HAVE_DOT
++DOXYGEN
++DOXYGEN_PROJECT_NAME
++DOXYGEN_PROJECT_NUMBER
++KDE_HAS_DOXYGEN
++KDE_BINDIR
++LIBART_LIBS
++LIBART_CFLAGS
++LIBART_RPATH
++RUN_KAPPFINDER
++include_kcontrol_access_TRUE
++include_kcontrol_access_FALSE
++include_kcontrol_accessibility_TRUE
++include_kcontrol_accessibility_FALSE
++SSL_INCLUDES
++SSL_LDFLAGS
++LIBSSL
++DPMSINC
++DPMSLIB
++LIBFONTCONFIG_LIBS
++LIBFONTCONFIG_CFLAGS
++LIBFONTCONFIG_RPATH
++LIB_TRU64_MACH
++GLINC
++GLLIB
++COMPILE_GL_INFO_TRUE
++COMPILE_GL_INFO_FALSE
++LIBUSBCONFIG
++USB_LIBS
++USB_CFLAGS
++include_kcontrol_joystick_TRUE
++include_kcontrol_joystick_FALSE
++LIBFREETYPE_LIBS
++LIBFREETYPE_CFLAGS
++LIBFREETYPE_RPATH
++UNAME
++LIB_FONT_ENC
++LIBXFT_LIB
++include_fontinst_tn_TRUE
++include_fontinst_tn_FALSE
++include_kcontrol_kfontinst_TRUE
++include_kcontrol_kfontinst_FALSE
++LIB_XRANDR
++include_kcontrol_randr_TRUE
++include_kcontrol_randr_FALSE
++include_kcontrol_smartcard_TRUE
++include_kcontrol_smartcard_FALSE
++include_kcontrol_usbview_TRUE
++include_kcontrol_usbview_FALSE
++install_usbids_TRUE
++install_usbids_FALSE
++include_kcontrol_view1394_TRUE
++include_kcontrol_view1394_FALSE
++LIB_XSS
++LIB_XF86MISC
++nogroup
++LIBXDMCP
++KRB4_INCS
++KRB4_LIBS
++KRB4_RPATH
++LIB_LIBS
++LIBPOSIX4
++KRB5_INCS
++KRB5_LIBS
++KRB5_RPATH
++LIB_ARTS
++ARTS_CFLAGS
++KHOTKEYS_ARTS_SUBDIR
++LIB_KVM
++LIB_XCOMPOSITE
++LIB_XFIXES
++SASL2_LIBS
++LIBBZ2
++include_BZIP2_TRUE
++include_BZIP2_FALSE
++LIB_LBER
++LDAP_INCS
++LDAP_LIBS
++LDAP_RPATH
++include_kioslave_ldap_TRUE
++include_kioslave_ldap_FALSE
++LINUXCDPOLLING
++PKG_CONFIG
++HAL_CFLAGS
++HAL_LIBS
++HAL_INCS
++DBUS_CFLAGS
++DBUS_LIBS
++DBUS_INCS
++DBUSQT_INCS
++DBUSQT_LIBS
++HALBACKEND
++include_media_linuxcdpolling_TRUE
++include_media_linuxcdpolling_FALSE
++include_media_halbackend_TRUE
++include_media_halbackend_FALSE
++SMBCLIENT_EXTRA_LIBS
++include_kioslave_smb_TRUE
++include_kioslave_smb_FALSE
++LIB_EXR
++EXR_FLAGS
++include_EXR_MODULES_TRUE
++include_EXR_MODULES_FALSE
++LIBMALLOC
++LIB_XINERAMA
++include_ksysguardd_TRUE
++include_ksysguardd_FALSE
++include_ksysguardd_linux_TRUE
++include_ksysguardd_linux_FALSE
++include_ksysguardd_freebsd_TRUE
++include_ksysguardd_freebsd_FALSE
++include_ksysguardd_netbsd_TRUE
++include_ksysguardd_netbsd_FALSE
++include_ksysguardd_solaris_TRUE
++include_ksysguardd_solaris_FALSE
++include_ksysguardd_tru64_TRUE
++include_ksysguardd_tru64_FALSE
++include_ksysguardd_irix_TRUE
++include_ksysguardd_irix_FALSE
++include_ksysguardd_openbsd_TRUE
++include_ksysguardd_openbsd_FALSE
++LIBHOSTS
++LIBSENSORS
++supports_i8k_TRUE
++supports_i8k_FALSE
++LIB_DNSSD
++HAVE_DNSSD_TRUE
++HAVE_DNSSD_FALSE
++include_kompmgr_TRUE
++include_kompmgr_FALSE
++TOPSUBDIRS
++libkonq_SUBDIR_included_TRUE
++libkonq_SUBDIR_included_FALSE
++applnk_SUBDIR_included_TRUE
++applnk_SUBDIR_included_FALSE
++doc_SUBDIR_included_TRUE
++doc_SUBDIR_included_FALSE
++drkonqi_SUBDIR_included_TRUE
++drkonqi_SUBDIR_included_FALSE
++kappfinder_SUBDIR_included_TRUE
++kappfinder_SUBDIR_included_FALSE
++kate_SUBDIR_included_TRUE
++kate_SUBDIR_included_FALSE
++kcheckpass_SUBDIR_included_TRUE
++kcheckpass_SUBDIR_included_FALSE
++kcminit_SUBDIR_included_TRUE
++kcminit_SUBDIR_included_FALSE
++kdcop_SUBDIR_included_TRUE
++kdcop_SUBDIR_included_FALSE
++kdebugdialog_SUBDIR_included_TRUE
++kdebugdialog_SUBDIR_included_FALSE
++kdeeject_SUBDIR_included_TRUE
++kdeeject_SUBDIR_included_FALSE
++kdepasswd_SUBDIR_included_TRUE
++kdepasswd_SUBDIR_included_FALSE
++kdeprint_SUBDIR_included_TRUE
++kdeprint_SUBDIR_included_FALSE
++kdesu_SUBDIR_included_TRUE
++kdesu_SUBDIR_included_FALSE
++kdialog_SUBDIR_included_TRUE
++kdialog_SUBDIR_included_FALSE
++kdmlib_SUBDIR_included_TRUE
++kdmlib_SUBDIR_included_FALSE
++kfind_SUBDIR_included_TRUE
++kfind_SUBDIR_included_FALSE
++khelpcenter_SUBDIR_included_TRUE
++khelpcenter_SUBDIR_included_FALSE
++khotkeys_SUBDIR_included_TRUE
++khotkeys_SUBDIR_included_FALSE
++kioslave_SUBDIR_included_TRUE
++kioslave_SUBDIR_included_FALSE
++klipper_SUBDIR_included_TRUE
++klipper_SUBDIR_included_FALSE
++kmenuedit_SUBDIR_included_TRUE
++kmenuedit_SUBDIR_included_FALSE
++knetattach_SUBDIR_included_TRUE
++knetattach_SUBDIR_included_FALSE
++konsole_SUBDIR_included_TRUE
++konsole_SUBDIR_included_FALSE
++kpager_SUBDIR_included_TRUE
++kpager_SUBDIR_included_FALSE
++kpersonalizer_SUBDIR_included_TRUE
++kpersonalizer_SUBDIR_included_FALSE
++kreadconfig_SUBDIR_included_TRUE
++kreadconfig_SUBDIR_included_FALSE
++kscreensaver_SUBDIR_included_TRUE
++kscreensaver_SUBDIR_included_FALSE
++ksplashml_SUBDIR_included_TRUE
++ksplashml_SUBDIR_included_FALSE
++kstart_SUBDIR_included_TRUE
++kstart_SUBDIR_included_FALSE
++ksysguard_SUBDIR_included_TRUE
++ksysguard_SUBDIR_included_FALSE
++ksystraycmd_SUBDIR_included_TRUE
++ksystraycmd_SUBDIR_included_FALSE
++ktip_SUBDIR_included_TRUE
++ktip_SUBDIR_included_FALSE
++kwin_SUBDIR_included_TRUE
++kwin_SUBDIR_included_FALSE
++kxkb_SUBDIR_included_TRUE
++kxkb_SUBDIR_included_FALSE
++l10n_SUBDIR_included_TRUE
++l10n_SUBDIR_included_FALSE
++nsplugins_SUBDIR_included_TRUE
++nsplugins_SUBDIR_included_FALSE
++pics_SUBDIR_included_TRUE
++pics_SUBDIR_included_FALSE
++konqueror_SUBDIR_included_TRUE
++konqueror_SUBDIR_included_FALSE
++ksmserver_SUBDIR_included_TRUE
++ksmserver_SUBDIR_included_FALSE
++kicker_SUBDIR_included_TRUE
++kicker_SUBDIR_included_FALSE
++kcontrol_SUBDIR_included_TRUE
++kcontrol_SUBDIR_included_FALSE
++kdesktop_SUBDIR_included_TRUE
++kdesktop_SUBDIR_included_FALSE
++kdm_SUBDIR_included_TRUE
++kdm_SUBDIR_included_FALSE
++LIBOBJS
++LTLIBOBJS'
  ac_subst_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.
-@@ -1025,6 +1025,8 @@
+ ac_init_help=
+@@ -492,34 +1291,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 +1354,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 +1373,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 +1392,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 +1419,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 +1449,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 +1523,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 +1589,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 +1598,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 +1629,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 +1649,19 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
++# Be sure to have absolute directory names.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
+-  eval ac_val=$`echo $ac_var`
++  eval ac_val=\$$ac_var
+   case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
+-  esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
+-do
+-  eval ac_val=$`echo $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 +1688,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 +1786,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 +1803,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 +1842,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -4005,32 +5771,981 @@
    --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
-@@ -1218,7 +1220,7 @@
+@@ -1042,10 +1861,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]
+@@ -1071,8 +1888,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
+@@ -1080,11 +1896,12 @@
+   --with-qt-includes=DIR  where the Qt includes are.
+   --with-qt-libraries=DIR where the Qt library is installed.
+   --without-arts          build without aRts default=no
+-  --with-pam=ARG        enable support for PAM: ARG=yes|no|service, name
++  --with-pam=ARG          enable support for PAM: ARG=yes|no|service, name
+   --with-shadow           If you want shadow password support
+-  --with-kdm-pam=val    override PAM service from --with-pam for kdm
+-  --with-kcp-pam=val    override PAM service from --with-pam for kcheckpass
+-  --with-kss-pam=val    override PAM service from --with-pam for kscreensaver
++  --with-kdm-pam=val      override PAM service from --with-pam for kdm
++  --with-kcp-pam=val      override PAM service from --with-pam for kcheckpass
++  --with-kss-pam=val      override PAM service from --with-pam for
++                          kscreensaver
+   --with-java=javadir     use java installed in javadir, --without-java
+                           disables
+   --without-composite     Disable Xcomposite support (default: check)
+@@ -1118,131 +1935,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;;
+-esac
+-
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-	   test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    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" || { 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
+-    fi
 -    cd $ac_popdir
-+    cd "$ac_popdir"
++    fi || ac_status=$?
++    cd "$ac_pwd" || { ac_status=$?; break; }
    done
  fi
  
-@@ -2121,6 +2123,31 @@
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
++configure
++generated by GNU Autoconf 2.59d
  
+-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
+ 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.59d.  Invocation command line was
  
-+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 or --disable-maintainer-mode was given.
+   $ $0 $@
+ 
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1261,7 +2047,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`
+@@ -1275,6 +2061,7 @@
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+ 
+ } >&5
+ 
+@@ -1307,7 +2094,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
+@@ -1342,8 +2129,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.
+   {
+@@ -1356,20 +2143,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
+@@ -1380,22 +2181,22 @@
+     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
++      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
++	echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1407,26 +2208,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.
+ 
+@@ -1457,14 +2256,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;}
+@@ -1480,8 +2282,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
+@@ -1493,12 +2295,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
+@@ -1523,8 +2324,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
+@@ -1541,12 +2341,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
+-
+ 
+ 
+ 
+@@ -1563,110 +2357,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.
+@@ -1676,17 +2525,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"
+@@ -1708,8 +2557,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
+@@ -1731,7 +2580,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.
+@@ -1750,21 +2599,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.
+@@ -1778,8 +2628,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
+@@ -1791,8 +2641,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
+@@ -1802,8 +2652,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
+@@ -1845,8 +2695,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`
+ 
+@@ -1897,8 +2747,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
+@@ -1911,41 +2761,44 @@
+   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
++{ 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
++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 'ac_maketemp=X"$(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
++if test "$ac_maketemp" != X ; then
+   eval ac_cv_prog_make_${ac_make}_set=yes
+ else
+   eval ac_cv_prog_make_${ac_make}_set=no
+@@ -1953,12 +2806,12 @@
+ 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
++  { 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
+ 
+@@ -2029,8 +2882,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
+@@ -2043,32 +2896,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
+@@ -2081,27 +2936,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
+@@ -2121,6 +2990,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.
 +if test "${enable_maintainer_mode+set}" = set; then
-+  enableval="$enable_maintainer_mode"
-+  USE_MAINTAINER_MODE=$enableval
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 +else
 +  USE_MAINTAINER_MODE=no
-+fi;
-+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++fi
 +
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 +
++
 +if test $USE_MAINTAINER_MODE = yes; then
 +  MAINTAINER_MODE_TRUE=
 +  MAINTAINER_MODE_FALSE='#'
@@ -4046,347 +6761,3039 @@
  
    unset CDPATH
  
-@@ -3054,8 +3081,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+@@ -2139,14 +3033,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
+ 
+@@ -2189,8 +3083,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.
+@@ -2201,8 +3095,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
+@@ -2211,14 +3105,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
+ 
+@@ -2261,8 +3155,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.
+@@ -2273,8 +3167,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
+@@ -2297,16 +3191,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
+@@ -2319,13 +3213,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=
+@@ -2342,11 +3236,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}
+@@ -2356,8 +3250,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
+@@ -2384,15 +3278,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='\'
+@@ -2412,10 +3306,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"
+@@ -2435,18 +3328,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
+@@ -2455,12 +3348,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
+@@ -2469,20 +3362,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"
+ 
+@@ -2494,8 +3388,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
+@@ -2508,32 +3402,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
+@@ -2546,36 +3442,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
+@@ -2588,74 +3499,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
+@@ -2669,7 +3540,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
+@@ -2680,6 +3551,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.
+@@ -2697,22 +3569,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
+@@ -2725,36 +3598,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
+ 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
+@@ -2767,29 +3642,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
+@@ -2802,25 +3693,38 @@
+    { (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
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
-@@ -3113,8 +3139,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -3230,8 +3255,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -3285,8 +3309,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+ 
++
++# List of possible output files.  We want to start from the most likely,
++# but we have to check foo.exe before foo, because Cygwin `test -f' looks
++# also for foo.exe.  b.out is created by i960 compilers.
++# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
++# But we are not allowed to rm a.*, and we do not want always remove
++# conftest.*, so we will list them literally, when appropriate.
++ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe 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.
++rm -f $ac_outfiles conftest.*
++
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -2836,51 +3740,40 @@
+   return 0;
+ }
+ _ACEOF
++
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files $ac_outfiles"
++
++# The following tests should remove their output except files matching conftest.*.
+ # 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
    ac_status=$?
-@@ -3331,8 +3354,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; 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
++  for ac_file in $ac_outfiles a.* conftest.* NO
+ 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.
+-	;;
+-    [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
+-	break;;
+-    * )
+-	break;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    * ) break;;
+   esac
+ done
++if test "$ac_file" = NO; then
++  { { echo "$as_me:$LINENO: error: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: no output file found
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2892,14 +3785,12 @@
+    { (exit 77); exit 77; }; }
+ fi
+ 
+-ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+-
+-# Check the compiler produces executables we can run.  If not, either
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++# 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
+@@ -2924,83 +3815,84 @@
+     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
+-# 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
++# Clean up; list also $ac_file, in case it matched a wildcard entry.
++rm -f $ac_outfiles $ac_file
+ 
+-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
++{ 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 test "${ac_cv_exeext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
    ac_status=$?
-@@ -3376,8 +3398,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; then
+-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  export ac_cv_exeext
+-	  break;;
+-    * ) break;;
+-  esac
+-done
++  # If both `conftest.exe' and `conftest' are `present' (well, observable),
++    # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++    # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
++    for ac_file in conftest.exe conftest conftest.* NO; do
++      test -f "$ac_file" || continue
++      case $ac_file in
++	*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++	*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	      break;;
++	* ) break;;
++      esac
++    done
++    if test "$ac_file" = NO; then
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: no output file found
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++    # Clean up; list also $ac_file, in case it matched conftest.*.
++    rm -f $ac_outfiles $ac_file
++
+ else
+   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
++
+ fi
+ 
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+-rm -f conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ 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
++
++
++ac_clean_files=$ac_clean_files_save
++
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.o conftest.obj
++  rm -f conftest.o conftest.obj
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -3934,8 +3955,7 @@
-   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'
-+	 { 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
+   (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
+@@ -3016,14 +3908,16 @@
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-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
++
++
++rm -f conftest.*
++{ 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
+@@ -3072,24 +3966,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
+@@ -3131,97 +4029,23 @@
+   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
++main ()
++{
+ 
+-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
++rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -3993,8 +4013,7 @@
-   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'
-+	 { 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
+@@ -3243,81 +4067,24 @@
    ac_status=$?
-@@ -4065,8 +4084,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4110,8 +4128,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4289,8 +4306,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (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'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&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;
+ }
+@@ -3344,30 +4111,104 @@
    ac_status=$?
-@@ -4401,8 +4417,7 @@
-   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'
-+	 { 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
+   (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
++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
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -4490,8 +4505,7 @@
-   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'
-+	 { 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
+@@ -3389,27 +4230,36 @@
    ac_status=$?
-@@ -4593,8 +4607,7 @@
-   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'
-+	 { 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
+   (exit $ac_status); }; }; then
+-  break
++  ac_cv_prog_cc_c89=$ac_arg
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-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
+ 
+-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'
+@@ -3418,8 +4268,8 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3508,8 +4358,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
+ 
+ 
+@@ -3531,8 +4381,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=
+@@ -3592,9 +4442,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.  */
+@@ -3632,6 +4483,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3649,8 +4501,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
+@@ -3699,9 +4551,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.  */
+@@ -3739,6 +4592,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3789,18 +4643,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
+@@ -3813,36 +4671,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
+@@ -3855,55 +4715,70 @@
+   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
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
-@@ -4693,8 +4706,7 @@
-   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'
-+	 { 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
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -4778,8 +4790,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -4868,8 +4879,7 @@
-   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'
-+	 { 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
+   (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
+@@ -3952,24 +4827,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
+@@ -4011,47 +4890,18 @@
+   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;
+ }
+@@ -4083,20 +4933,19 @@
+   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;
+ }
+@@ -4123,21 +4972,40 @@
    ac_status=$?
-@@ -4956,8 +4966,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5044,8 +5053,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5152,8 +5160,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5246,8 +5253,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5334,8 +5340,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5422,8 +5427,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5510,8 +5514,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5626,8 +5629,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -5719,8 +5721,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5808,8 +5809,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5896,8 +5896,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5984,8 +5983,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6072,8 +6070,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6160,8 +6157,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6584,8 +6580,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6711,8 +6706,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6800,8 +6794,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -6884,185 +6877,6 @@
+   (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'
+@@ -4146,8 +5014,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
+@@ -4236,8 +5104,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
+ 
+ 
+@@ -4255,8 +5123,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
+@@ -4307,13 +5175,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:
+@@ -4355,17 +5224,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'
+@@ -4419,7 +5287,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4433,29 +5303,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-fno-builtin $CXXFLAGS"
+ else
+- echo "$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'
+@@ -4508,7 +5377,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4522,13 +5393,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
+ else
+- 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
+@@ -4549,16 +5420,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'
+@@ -4611,7 +5481,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4625,16 +5497,16 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       CFLAGS="-pg $CFLAGS"
+       CXXFLAGS="-pg $CXXFLAGS"
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4649,16 +5521,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'
+@@ -4711,7 +5582,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4725,27 +5598,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'
+@@ -4796,7 +5668,9 @@
+   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
+   CFLAGS="$save_CFLAGS"
+@@ -4810,13 +5684,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -4824,16 +5698,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'
+@@ -4886,7 +5759,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4900,28 +5775,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wundef $CXXFLAGS"
+ else
+- echo "$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'
+@@ -4974,7 +5848,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -4988,28 +5864,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="-Wno-long-long $CXXFLAGS"
+ else
+- echo "$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'
+@@ -5062,7 +5937,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5076,13 +5953,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5094,13 +5971,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
+ 
+@@ -5108,16 +5985,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'
+@@ -5170,7 +6046,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5184,13 +6062,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  gcc_no_reorder_blocks=YES
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -5202,16 +6080,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'
+@@ -5264,7 +6141,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5278,28 +6157,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ else
+- echo "$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'
+@@ -5352,7 +6230,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5366,28 +6246,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-check-new"
+ else
+- echo "$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'
+@@ -5440,7 +6319,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5454,28 +6335,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS -fno-common"
+ else
+- echo "$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'
+@@ -5528,7 +6408,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5542,13 +6424,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_EXCEPTIONS="-fexceptions"
+ else
+- 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
+@@ -5556,37 +6438,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
+@@ -5644,9 +6526,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -5654,8 +6537,8 @@
+   fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
+-echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5
++echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; }
+ 
+     if test "x$kde_cv_opt_noinline_match" = "xno" ; then
+        CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
+@@ -5675,16 +6558,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'
+@@ -5737,7 +6619,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5751,29 +6635,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --pch"
+ else
+- echo "$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'
+@@ -5826,7 +6709,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5840,28 +6725,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
+ else
+- echo "$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'
+@@ -5914,7 +6798,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -5928,28 +6814,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
+ else
+- echo "$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'
+@@ -6002,7 +6887,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6016,28 +6903,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
+ else
+- echo "$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'
+@@ -6090,7 +6976,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6104,28 +6992,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
+ else
+- echo "$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'
+@@ -6178,7 +7065,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6192,13 +7081,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  CXXFLAGS="$CXXFLAGS --one_per"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -6305,13 +7194,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
+@@ -6367,9 +7256,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.  */
+@@ -6407,6 +7297,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6424,8 +7315,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
+@@ -6474,9 +7365,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.  */
+@@ -6514,6 +7406,7 @@
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -6540,16 +7433,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'
+@@ -6602,7 +7494,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6616,22 +7510,21 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  NOOPT_CXXFLAGS=-O0
+ else
+- echo "$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"
+@@ -6647,36 +7540,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'
+@@ -6729,7 +7622,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6743,29 +7638,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags"
+ else
+- echo "$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'
+@@ -6818,7 +7712,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -6832,13 +7728,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
+@@ -6848,13 +7744,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=""
+@@ -6867,13 +7763,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
+@@ -6884,198 +7780,19 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -4572,7 +9979,125 @@
    fi
  
  
-@@ -7237,7 +7051,7 @@
+ 
+ 
+ 
+-  # Check whether --enable-nmcheck or --disable-nmcheck was given.
++  # Check whether --enable-nmcheck was given.
+ if test "${enable_nmcheck+set}" = set; then
+-  enableval="$enable_nmcheck"
+-  kde_use_nmcheck=$enableval
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
+   kde_use_nmcheck=no
+-fi;
++fi
++
+ 
+   if test "$kde_use_nmcheck" = "yes"; then
+       KDE_USE_NMCHECK_TRUE=""
+@@ -7090,10 +7807,9 @@
+ 
+ 
+ 
+-# 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 ;;
+@@ -7112,12 +7828,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 ;;
+@@ -7136,7 +7852,8 @@
+     esac
+ else
+   enable_static=no
+-fi;
++fi
++
+ 
+ 
+ 
+@@ -7145,11 +7862,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
+ 
+@@ -7170,8 +7887,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 ""
+@@ -7187,14 +7904,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 ;;
+@@ -7213,10 +7929,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
+@@ -7240,7 +7957,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
@@ -4581,7 +10106,258 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7342,7 +7156,7 @@
+@@ -7269,51 +7986,198 @@
+ 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 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 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
+-  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_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
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
+ 
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
++
++{ 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
+-  with_gnu_ld=no
+-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
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [\\/]* | ?:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++  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
++  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
++
++
++   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 was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++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; }
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ 	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+       done
+       test -z "$LD" && LD="$ac_prog"
+@@ -7328,11 +8192,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
+@@ -7345,7 +8209,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,
@@ -4590,7 +10366,27 @@
        # 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'*)
-@@ -7376,7 +7190,7 @@
+@@ -7365,21 +8229,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; }
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -4599,7 +10395,33 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7406,6 +7220,15 @@
+@@ -7389,29 +8253,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
+ "" | " "*) ;;
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -4613,9 +10435,14 @@
 +    ;;
 +esac
  
- echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
- echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7416,36 +7239,43 @@
+-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
+@@ -7419,56 +8292,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -4683,7 +10510,37 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
-@@ -7492,44 +7322,36 @@
+-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
+@@ -7495,44 +8375,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -4738,7 +10595,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7545,7 +7367,7 @@
+@@ -7548,7 +8420,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -4747,7 +10604,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
-@@ -7561,43 +7383,27 @@
+@@ -7564,43 +8436,27 @@
    esac
    ;;
  
@@ -4804,7 +10661,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
-@@ -7616,32 +7422,22 @@
+@@ -7619,32 +8475,22 @@
    ;;
  
  openbsd*)
@@ -4840,7 +10697,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]'
-@@ -7662,10 +7458,13 @@
+@@ -7665,17 +8511,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -4855,7 +10712,16 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -7681,6 +7480,9 @@
+ 
+ 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
+@@ -7684,14 +8533,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -4865,16 +10731,27 @@
  # Allow CC to be a program name with arguments.
  compiler=$CC
  
-@@ -7715,7 +7517,7 @@
+-# 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
+@@ -7718,7 +8570,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7718 "configure"' > conftest.$ac_ext
-+  echo '#line 7520 "configure"' > conftest.$ac_ext
+-  echo '#line 7721 "configure"' > conftest.$ac_ext
++  echo '#line 8573 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7758,14 +7560,13 @@
+@@ -7761,14 +8613,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -4891,7 +10768,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7777,7 +7578,6 @@
+@@ -7780,7 +8631,6 @@
        esac
        ;;
      *64-bit*)
@@ -4899,17 +10776,38 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7837,8 +7637,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -7873,6 +7672,26 @@
+@@ -7805,8 +8655,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
+@@ -7858,8 +8708,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
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+@@ -7869,13 +8720,33 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -4936,38 +10834,194 @@
  
  esac
  
-@@ -7913,8 +7732,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -8084,8 +7902,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -8152,8 +7969,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -8268,6 +8084,243 @@
+@@ -7883,8 +8754,8 @@
  
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -7934,8 +8805,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
+@@ -7992,6 +8864,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))
+@@ -8011,8 +8884,8 @@
+   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
+@@ -8035,12 +8908,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
+@@ -8063,9 +8938,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
+@@ -8105,12 +8980,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
+@@ -8125,18 +9002,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
+@@ -8173,15 +9051,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
+@@ -8215,9 +9094,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
+@@ -8241,25 +9121,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
+@@ -8271,17 +9145,258 @@
+ 
  done
  
 +
@@ -4975,13 +11029,13 @@
 +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=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
@@ -5037,9 +11091,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.  */
@@ -5077,6 +11132,7 @@
 +ac_preproc_ok=:
 +break
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -5094,8 +11150,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
@@ -5144,9 +11200,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.  */
@@ -5184,6 +11241,7 @@
 +ac_preproc_ok=:
 +break
 +fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -5199,7 +11257,7 @@
 +   { (exit 1); exit 1; }; }
 +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'
@@ -5210,45 +11268,219 @@
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8360,7 +8413,7 @@
+ 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
+@@ -8294,36 +9409,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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8336,48 +9453,63 @@
+   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:8363:" \
-+echo "$as_me:8416:" \
-      "checking for Fortran 77 compiler version" >&5
+-echo "$as_me:8366:" \
+-     "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
-@@ -8406,8 +8459,7 @@
-   cat conftest.err >&5
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
++  (eval $ac_compiler --version >&5) 2>&5
+   ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
-+	 { 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
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
++  (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
-@@ -8456,8 +8508,7 @@
-   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'
-+	 { 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
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
++  (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
-@@ -8515,7 +8566,7 @@
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+@@ -8387,8 +9519,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
+@@ -8427,20 +9559,21 @@
+   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_f77_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8477,13 +9610,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_f77_g=no
++	ac_cv_prog_f77_g=no
+ fi
++
+ 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
++{ 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
+@@ -8512,13 +9646,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ 
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
      i=0
 -  testring="ABCD"
 +  teststring="ABCD"
  
    case $build_os in
    msdosdjgpp*)
-@@ -8544,20 +8595,70 @@
+@@ -8547,20 +9681,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -5325,7 +11557,33 @@
      # 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.
-@@ -8594,9 +8695,6 @@
+@@ -8571,19 +9755,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
+@@ -8597,9 +9781,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -5335,7 +11593,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'"
  
-@@ -8618,14 +8716,30 @@
+@@ -8621,14 +9802,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'"
    ;;
@@ -5368,7 +11626,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8643,14 +8757,17 @@
+@@ -8646,14 +9843,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -5388,8 +11646,41 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8812,7 +8929,7 @@
+@@ -8771,15 +9971,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
  
+-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
+@@ -8793,8 +9993,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
+ 
+ 
+@@ -8815,7 +10015,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//'
@@ -5397,7 +11688,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8832,7 +8949,7 @@
+@@ -8835,7 +10035,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -5406,7 +11697,313 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -9089,6 +9206,7 @@
+@@ -8845,8 +10045,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
+@@ -8859,32 +10059,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
+@@ -8897,27 +10099,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
+@@ -8925,8 +10141,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
+@@ -8939,32 +10155,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
+@@ -8977,27 +10195,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
+@@ -9005,8 +10237,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
+@@ -9019,32 +10251,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
+@@ -9057,27 +10291,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
+@@ -9092,6 +10340,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -5414,7 +12011,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9108,15 +9226,26 @@
+@@ -9111,21 +10360,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -5443,7 +12040,15 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -9142,7 +9271,7 @@
+   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
+@@ -9145,7 +10405,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -5452,7 +12057,31 @@
  	  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
-@@ -9204,7 +9333,7 @@
+@@ -9177,17 +10437,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
+@@ -9207,7 +10467,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -5461,7 +12090,52 @@
  	  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
-@@ -9299,68 +9428,25 @@
+@@ -9239,11 +10499,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
+@@ -9258,21 +10518,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
+@@ -9302,68 +10562,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -5545,7 +12219,18 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9389,18 +9475,20 @@
+@@ -9377,8 +10594,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
+@@ -9392,26 +10609,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -5553,13 +12238,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:9395: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9481: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9398: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10615: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9399: \$? = $ac_status" >&5
-+   echo "$as_me:9485: \$? = $ac_status" >&5
+-   echo "$as_me:9402: \$? = $ac_status" >&5
++   echo "$as_me:10619: \$? = $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
@@ -5571,7 +12256,28 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -9461,6 +9549,11 @@
+    $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"
+@@ -9425,8 +10644,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,'
+@@ -9464,6 +10683,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -5583,7 +12289,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9477,7 +9570,7 @@
+@@ -9480,7 +10704,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -5592,7 +12298,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9503,6 +9596,16 @@
+@@ -9506,6 +10730,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -5609,7 +12315,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9514,7 +9617,7 @@
+@@ -9517,7 +10751,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.
@@ -5618,7 +12324,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9537,13 +9640,20 @@
+@@ -9540,13 +10774,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -5641,7 +12347,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9558,15 +9668,15 @@
+@@ -9561,15 +10802,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -5663,7 +12369,7 @@
        ;;
  
      sunos4*)
-@@ -9575,7 +9685,7 @@
+@@ -9578,7 +10819,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -5672,7 +12378,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9588,6 +9698,17 @@
+@@ -9591,6 +10832,17 @@
        fi
        ;;
  
@@ -5690,7 +12396,28 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9622,18 +9743,20 @@
+@@ -9602,16 +10854,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
+@@ -9625,26 +10877,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -5698,13 +12425,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:9628: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9749: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9631: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10883: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9632: \$? = $ac_status" >&5
-+   echo "$as_me:9753: \$? = $ac_status" >&5
+-   echo "$as_me:9635: \$? = $ac_status" >&5
++   echo "$as_me:10887: \$? = $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
@@ -5716,28 +12443,65 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-@@ -9654,7 +9777,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works" = xyes; then
+     case $lt_prog_compiler_pic in
+@@ -9657,7 +10911,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=
-@@ -9664,6 +9787,48 @@
+@@ -9667,72 +10921,112 @@
      ;;
  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+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+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
++{ 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
+-
+-   # 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' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9698: $lt_compile\"" >&5)
 +  lt_prog_compiler_static_works=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -5761,8 +12525,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
 +    :
@@ -5771,37 +12535,33 @@
 +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+set}" = set; then
-@@ -9676,38 +9841,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' \
++{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
 +   -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:9695: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9853: $lt_compile\"" >&5)
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:10987: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9699: \$? = $ac_status" >&5
-+   echo "$as_me:9857: \$? = $ac_status" >&5
+-   echo "$as_me:9702: \$? = $ac_status" >&5
++   echo "$as_me:10991: \$? = $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
@@ -5825,7 +12585,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9778,6 +9941,16 @@
+ 
+ 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;}
+@@ -9742,8 +11036,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=
+@@ -9781,6 +11075,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -5842,7 +12641,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9788,6 +9961,10 @@
+@@ -9791,6 +11095,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -5853,7 +12652,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9798,6 +9975,27 @@
+@@ -9801,6 +11109,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -5881,7 +12680,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9835,7 +10033,7 @@
+@@ -9838,7 +11167,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -5890,7 +12689,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9845,13 +10043,13 @@
+@@ -9848,13 +11177,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'
@@ -5907,18 +12706,17 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9860,23 +10058,70 @@
+@@ -9863,23 +11192,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       else
- 	ld_shlibs=no
-       fi
-       ;;
- 
--    netbsd*)
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    interix3*)
 +      hardcode_direct=no
 +      hardcode_shlibpath_var=no
@@ -5961,11 +12759,12 @@
 +	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -5983,7 +12782,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9890,13 +10135,40 @@
+@@ -9893,13 +11269,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6026,7 +12825,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9906,24 +10178,19 @@
+@@ -9909,24 +11312,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6058,7 +12857,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9935,7 +10202,7 @@
+@@ -9938,7 +11336,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -6067,7 +12866,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9957,9 +10224,21 @@
+@@ -9960,9 +11358,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
@@ -6091,7 +12890,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9976,7 +10255,7 @@
+@@ -9979,7 +11389,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -6100,7 +12899,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`
-@@ -9995,8 +10274,12 @@
+@@ -9998,8 +11408,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -6113,7 +12912,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -10004,22 +10287,23 @@
+@@ -10007,22 +11421,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -6144,17 +12943,14 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10043,8 +10327,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -10071,14 +10354,13 @@
+@@ -10069,19 +11484,20 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -6172,17 +12968,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10105,8 +10387,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -10138,13 +10419,11 @@
+@@ -10131,7 +11547,9 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -10141,13 +11559,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -6199,7 +12995,7 @@
  	fi
        fi
        ;;
-@@ -10157,7 +10436,7 @@
+@@ -10160,7 +11576,7 @@
        ld_shlibs=no
        ;;
  
@@ -6208,7 +13004,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10167,13 +10446,13 @@
+@@ -10170,13 +11586,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -6225,7 +13021,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.
-@@ -10183,52 +10462,52 @@
+@@ -10186,52 +11602,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -6318,7 +13114,7 @@
      fi
        ;;
  
-@@ -10262,8 +10541,8 @@
+@@ -10265,8 +11681,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6329,7 +13125,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10271,7 +10550,7 @@
+@@ -10274,7 +11690,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -6338,7 +13134,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
-@@ -10285,47 +10564,62 @@
+@@ -10288,47 +11704,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -6425,7 +13221,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10339,7 +10633,7 @@
+@@ -10342,7 +11773,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -6434,7 +13230,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'
-@@ -10349,7 +10643,7 @@
+@@ -10352,7 +11783,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -6443,7 +13239,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10372,7 +10666,8 @@
+@@ -10375,7 +11806,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
@@ -6453,7 +13249,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10382,7 +10677,7 @@
+@@ -10385,7 +11817,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -6462,7 +13258,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10393,14 +10688,14 @@
+@@ -10396,14 +11828,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -6479,7 +13275,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'
-@@ -10412,13 +10707,13 @@
+@@ -10415,13 +11847,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6495,7 +13291,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10426,21 +10721,15 @@
+@@ -10429,21 +11861,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -6521,7 +13317,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'
-@@ -10449,8 +10738,18 @@
+@@ -10452,8 +11878,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -6542,7 +13338,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10459,7 +10758,7 @@
+@@ -10462,7 +11898,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.
@@ -6551,7 +13347,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10507,36 +10806,45 @@
+@@ -10510,36 +11946,45 @@
        fi
        ;;
  
@@ -6618,8 +13414,14 @@
        ;;
  
      uts4*)
-@@ -10555,11 +10863,6 @@
- echo "${ECHO_T}$ld_shlibs" >&6
+@@ -10554,15 +11999,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6; }
  test "$ld_shlibs" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -6630,7 +13432,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10592,6 +10895,7 @@
+@@ -10580,8 +12020,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
+ 
+@@ -10595,6 +12035,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -6638,7 +13451,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10627,7 +10931,7 @@
+@@ -10617,20 +12058,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; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -6647,7 +13477,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10637,7 +10941,20 @@
+@@ -10640,7 +12081,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6669,7 +13499,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10702,7 +11019,7 @@
+@@ -10705,7 +12159,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6678,7 +13508,7 @@
    ;;
  
  beos*)
-@@ -10711,7 +11028,7 @@
+@@ -10714,7 +12168,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -6687,7 +13517,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10727,7 +11044,7 @@
+@@ -10730,7 +12184,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -6696,7 +13526,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10739,7 +11056,8 @@
+@@ -10742,7 +12196,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -6706,7 +13536,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10769,7 +11087,7 @@
+@@ -10772,7 +12227,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6715,7 +13545,7 @@
        ;;
      esac
      ;;
-@@ -10792,7 +11110,7 @@
+@@ -10795,7 +12250,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -6724,7 +13554,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"`
-@@ -10815,20 +11133,17 @@
+@@ -10818,20 +12273,17 @@
    dynamic_linker=no
    ;;
  
@@ -6756,7 +13586,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10846,14 +11161,19 @@
+@@ -10849,14 +12301,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -6778,7 +13608,7 @@
    esac
    ;;
  
-@@ -10873,9 +11193,9 @@
+@@ -10876,9 +12333,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -6790,7 +13620,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10890,7 +11210,7 @@
+@@ -10893,7 +12350,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -6799,7 +13629,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10901,7 +11221,7 @@
+@@ -10904,7 +12361,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -6808,7 +13638,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10913,6 +11233,18 @@
+@@ -10916,6 +12373,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -6827,7 +13657,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10956,29 +11288,26 @@
+@@ -10959,29 +12428,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -6864,7 +13694,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,
-@@ -10988,6 +11317,18 @@
+@@ -10991,6 +12457,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6883,7 +13713,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10997,7 +11338,7 @@
+@@ -11000,7 +12478,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -6892,7 +13722,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11025,8 +11366,13 @@
+@@ -11028,8 +12506,13 @@
  
  openbsd*)
    version_type=sunos
@@ -6907,7 +13737,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
-@@ -11046,7 +11392,7 @@
+@@ -11049,7 +12532,7 @@
  
  os2*)
    libname_spec='$name'
@@ -6916,7 +13746,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11064,13 +11410,6 @@
+@@ -11067,13 +12550,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -6930,7 +13760,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11096,7 +11435,7 @@
+@@ -11099,7 +12575,7 @@
    need_version=yes
    ;;
  
@@ -6939,7 +13769,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'
-@@ -11129,6 +11468,29 @@
+@@ -11132,6 +12608,29 @@
    fi
    ;;
  
@@ -6969,17 +13799,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11144,12 +11506,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -11143,16 +12642,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-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 " || \
@@ -6989,77 +13827,428 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11275,8 +11642,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -11379,8 +11745,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -11445,8 +11810,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -11539,8 +11903,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -11605,8 +11968,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -11672,8 +12034,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -11739,8 +12100,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -11799,7 +12159,7 @@
+@@ -11172,8 +12676,8 @@
+   # directories.
+   hardcode_action=unsupported
+ fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
++{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6; }
+ 
+ if test "$hardcode_action" = relink; then
+   # Fast installation is not supported
+@@ -11186,29 +12690,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
+@@ -11240,8 +12744,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
+@@ -11254,17 +12758,17 @@
+ 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;
+ }
+@@ -11296,14 +12800,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 \
+       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
+@@ -11317,8 +12822,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
+@@ -11345,30 +12850,24 @@
+ 
+ #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;
+ }
+@@ -11400,18 +12899,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 \
+       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
+@@ -11424,17 +12924,17 @@
+ 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;
+ }
+@@ -11466,19 +12966,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 \
+       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
+@@ -11505,30 +13006,24 @@
+ 
+ #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;
+ }
+@@ -11560,18 +13055,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 \
+       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
+@@ -11584,17 +13080,17 @@
+ 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;
+ }
+@@ -11626,19 +13122,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 \
+       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
+@@ -11651,17 +13148,17 @@
+ 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;
+ }
+@@ -11693,19 +13190,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 \
+       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
+@@ -11718,17 +13216,17 @@
+ 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;
+ }
+@@ -11760,14 +13258,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 \
+       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
+@@ -11802,13 +13301,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -7068,16 +14257,24 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -11815,7 +12175,7 @@
+ 
+-    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
+@@ -11818,7 +13317,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11818 "configure"
-+#line 12178 "configure"
+-#line 11821 "configure"
++#line 13320 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11872,6 +12232,8 @@
+@@ -11875,6 +13374,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -7086,7 +14283,7 @@
  
      exit (status);
  }
-@@ -11881,12 +12243,12 @@
+@@ -11884,12 +13385,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7101,25 +14298,35 @@
      esac
    else :
      # compilation failed
-@@ -11901,7 +12263,7 @@
- echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+@@ -11900,13 +13401,13 @@
  
+ 
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+ 
      if test "x$lt_cv_dlopen_self" = xyes; then
 -      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
-@@ -11913,7 +12275,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -11916,7 +13417,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11916 "configure"
-+#line 12278 "configure"
+-#line 11919 "configure"
++#line 13420 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11970,6 +12332,8 @@
+@@ -11973,6 +13474,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -7128,7 +14335,7 @@
  
      exit (status);
  }
-@@ -11979,12 +12343,12 @@
+@@ -11982,12 +13485,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7143,17 +14350,38 @@
      esac
    else :
      # compilation failed
-@@ -12017,7 +12381,7 @@
+@@ -11998,8 +13501,8 @@
+ 
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+     fi
  
+     CPPFLAGS="$save_CPPFLAGS"
+@@ -12020,19 +13523,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
-@@ -12029,7 +12393,7 @@
++{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6; }
  
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
 -case "$host_os" in
@@ -7161,7 +14389,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12038,47 +12402,10 @@
+@@ -12041,58 +13544,21 @@
    fi
    ;;
  
@@ -7209,8 +14437,25 @@
 -  fi
      ;;
  esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12104,7 +12431,8 @@
+-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
+@@ -12107,7 +13573,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.
@@ -7220,7 +14465,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 \
-@@ -12218,11 +12546,11 @@
+@@ -12221,11 +13688,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -7234,7 +14479,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12252,6 +12580,12 @@
+@@ -12255,6 +13722,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -7247,7 +14492,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12263,6 +12597,9 @@
+@@ -12266,6 +13739,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -7257,7 +14502,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12282,7 +12619,7 @@
+@@ -12285,7 +13761,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7266,7 +14511,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12313,7 +12650,7 @@
+@@ -12316,7 +13792,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7275,7 +14520,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12328,7 +12665,7 @@
+@@ -12331,7 +13807,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -7284,7 +14529,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12555,7 +12892,10 @@
+@@ -12558,7 +14034,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.
@@ -7296,7 +14541,23 @@
  fi
  
  
-@@ -12590,6 +12930,9 @@
+@@ -12571,11 +14050,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
+@@ -12593,6 +14072,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -7306,18 +14567,20 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12620,7 +12963,9 @@
+@@ -12623,8 +14105,10 @@
  
        case $tagname in
        CXX)
 -	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-	  ac_ext=cc
 +	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cc
++	  ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12640,6 +12985,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -12643,6 +14127,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -7325,7 +14588,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12657,7 +13003,7 @@
+@@ -12660,7 +14145,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -7334,7 +14597,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12667,17 +13013,34 @@
+@@ -12670,17 +14155,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -7370,7 +14633,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12688,18 +13051,27 @@
+@@ -12691,18 +14193,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -7401,7 +14664,48 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12770,7 +13142,7 @@
+@@ -12716,18 +14227,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
+@@ -12756,11 +14267,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
+@@ -12773,7 +14284,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,
@@ -7410,7 +14714,27 @@
        # 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'*)
-@@ -12804,7 +13176,7 @@
+@@ -12793,21 +14304,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; }
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -7419,7 +14743,18 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12823,8 +13195,8 @@
+@@ -12817,8 +14328,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
+ 
+ 
+@@ -12826,8 +14337,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
@@ -7430,7 +14765,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12850,7 +13222,7 @@
+@@ -12853,7 +14364,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.
@@ -7439,7 +14774,18 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12881,8 +13253,23 @@
+@@ -12868,8 +14379,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*)
+@@ -12884,8 +14395,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -7465,7 +14811,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12899,7 +13286,7 @@
+@@ -12902,7 +14428,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -7474,7 +14820,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`
-@@ -12918,8 +13305,12 @@
+@@ -12921,8 +14447,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -7487,7 +14833,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12928,15 +13319,16 @@
+@@ -12931,15 +14461,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -7508,18 +14854,17 @@
      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.
-@@ -12966,8 +13358,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -12996,13 +13387,12 @@
+@@ -12992,20 +14523,21 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -      archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
@@ -7534,17 +14879,17 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13029,8 +13419,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -13062,16 +13451,26 @@
+@@ -13055,7 +14587,9 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -13065,16 +14599,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -7576,7 +14921,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13085,12 +13484,12 @@
+@@ -13088,12 +14632,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'
@@ -7591,7 +14936,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
-@@ -13099,70 +13498,81 @@
+@@ -13102,70 +14646,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -7725,7 +15070,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13173,14 +13583,14 @@
+@@ -13176,14 +14731,14 @@
  	;;
      esac
      ;;
@@ -7742,7 +15087,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13197,12 +13607,12 @@
+@@ -13200,12 +14755,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -7758,7 +15103,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13211,11 +13621,11 @@
+@@ -13214,11 +14769,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.
@@ -7772,7 +15117,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13225,33 +13635,22 @@
+@@ -13228,33 +14783,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -7813,7 +15158,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13262,17 +13661,20 @@
+@@ -13265,17 +14809,20 @@
      esac
  
      case $cc_basename in
@@ -7840,7 +15185,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13288,12 +13690,15 @@
+@@ -13291,12 +14838,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -7860,7 +15205,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13304,11 +13709,25 @@
+@@ -13307,11 +14857,25 @@
  	;;
      esac
      ;;
@@ -7888,7 +15233,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13319,9 +13738,9 @@
+@@ -13322,9 +14886,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -7900,7 +15245,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13330,16 +13749,16 @@
+@@ -13333,16 +14897,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -7921,7 +15266,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13357,20 +13776,44 @@
+@@ -13360,20 +14924,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -7972,7 +15317,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13398,7 +13841,7 @@
+@@ -13401,7 +14989,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -7981,7 +15326,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13408,7 +13851,7 @@
+@@ -13411,7 +14999,7 @@
  	;;
      esac
      ;;
@@ -7990,7 +15335,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=
-@@ -13419,15 +13862,31 @@
+@@ -13422,15 +15010,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::"'
      ;;
@@ -8024,7 +15369,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13437,14 +13896,14 @@
+@@ -13440,14 +15044,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -8042,7 +15387,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13462,7 +13921,7 @@
+@@ -13465,7 +15069,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8051,7 +15396,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13481,13 +13940,13 @@
+@@ -13484,13 +15088,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -8067,7 +15412,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13496,17 +13955,17 @@
+@@ -13499,17 +15103,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -8089,7 +15434,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13525,7 +13984,7 @@
+@@ -13528,7 +15132,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -8098,7 +15443,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13546,27 +14005,14 @@
+@@ -13549,27 +15153,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -8128,7 +15473,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13579,36 +14025,33 @@
+@@ -13582,36 +15173,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -8177,7 +15522,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13616,9 +14059,9 @@
+@@ -13619,9 +15207,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -8189,7 +15534,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13628,9 +14071,9 @@
+@@ -13631,9 +15219,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
@@ -8201,7 +15546,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13639,9 +14082,9 @@
+@@ -13642,9 +15230,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -8213,7 +15558,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13654,12 +14097,63 @@
+@@ -13657,12 +15245,63 @@
  	;;
      esac
      ;;
@@ -8279,7 +15624,18 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13716,7 +14210,7 @@
+@@ -13682,8 +15321,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"
+@@ -13719,7 +15358,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.
@@ -8288,7 +15644,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13756,7 +14250,7 @@
+@@ -13759,7 +15398,7 @@
         fi
         ;;
  
@@ -8297,7 +15653,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13792,6 +14286,29 @@
+@@ -13795,6 +15434,29 @@
  
  $rm -f confest.$objext
  
@@ -8327,7 +15683,18 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13839,6 +14356,10 @@
+@@ -13803,8 +15465,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
+@@ -13842,6 +15504,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -8338,7 +15705,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13847,7 +14368,7 @@
+@@ -13850,7 +15516,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -8347,7 +15714,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13872,18 +14393,28 @@
+@@ -13875,18 +15541,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -8379,7 +15746,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13891,22 +14422,22 @@
+@@ -13894,22 +15570,22 @@
  	    ;;
  	esac
  	;;
@@ -8408,7 +15775,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13919,9 +14450,13 @@
+@@ -13922,9 +15598,13 @@
  	    ;;
  	esac
  	;;
@@ -8423,7 +15790,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13930,20 +14465,26 @@
+@@ -13933,20 +15613,26 @@
  	    ;;
  	esac
  	;;
@@ -8454,7 +15821,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13960,25 +14501,25 @@
+@@ -13963,25 +15649,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -8485,7 +15852,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13992,24 +14533,15 @@
+@@ -13995,24 +15681,15 @@
  	;;
        psos*)
  	;;
@@ -8512,7 +15879,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -14019,12 +14551,12 @@
+@@ -14022,12 +15699,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -8527,7 +15894,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14034,7 +14566,7 @@
+@@ -14037,7 +15714,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -8536,7 +15903,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14042,7 +14574,14 @@
+@@ -14045,7 +15722,14 @@
  	    ;;
  	esac
  	;;
@@ -8552,7 +15919,28 @@
  	;;
        vxworks*)
  	;;
-@@ -14075,18 +14614,20 @@
+@@ -14055,16 +15739,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
+@@ -14078,26 +15762,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -8560,13 +15948,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:14081: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14620: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14084: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15768: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14085: \$? = $ac_status" >&5
-+   echo "$as_me:14624: \$? = $ac_status" >&5
+-   echo "$as_me:14088: \$? = $ac_status" >&5
++   echo "$as_me:15772: \$? = $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
@@ -8578,37 +15966,40 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-@@ -14107,7 +14648,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
+     case $lt_prog_compiler_pic_CXX in
+@@ -14110,7 +15796,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=
-@@ -14117,24 +14658,59 @@
+@@ -14120,8 +15806,50 @@
      ;;
  esac
  
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-+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
++{ 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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  lt_prog_compiler_static_works_CXX=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -8632,8 +16023,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
 +    :
@@ -8641,6 +16032,15 @@
 +    lt_prog_compiler_static_CXX=
 +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
+@@ -14132,60 +15860,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
 -   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
 -   # that will create temporary files in the current directory regardless of
@@ -8648,21 +16048,10 @@
 -   # to fail, enabling locking or at least warning the user not to do parallel
 -   # builds.
 -   chmod -w .
-+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
-@@ -14142,25 +14718,30 @@
+    # (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 \
@@ -8670,13 +16059,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:14148: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14724: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14151: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15872: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14152: \$? = $ac_status" >&5
-+   echo "$as_me:14728: \$? = $ac_status" >&5
+-   echo "$as_me:14155: \$? = $ac_status" >&5
++   echo "$as_me:15876: \$? = $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
@@ -8700,7 +16089,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14210,7 +14791,10 @@
+ 
+ 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;}
+@@ -14195,8 +15921,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
+@@ -14213,22 +15939,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -8712,8 +16140,13 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14221,11 +14805,6 @@
- echo "${ECHO_T}$ld_shlibs_CXX" >&6
+   ;;
+   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
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -8724,7 +16157,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14258,6 +14837,7 @@
+@@ -14246,8 +15970,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
+ 
+@@ -14261,6 +15985,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -8732,7 +16176,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14293,7 +14873,7 @@
+@@ -14283,20 +16008,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; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -8741,7 +16202,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14303,7 +14883,20 @@
+@@ -14306,7 +16031,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8763,7 +16224,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14368,7 +14961,7 @@
+@@ -14371,7 +16109,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8772,7 +16233,7 @@
    ;;
  
  beos*)
-@@ -14377,7 +14970,7 @@
+@@ -14380,7 +16118,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -8781,7 +16242,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14393,7 +14986,7 @@
+@@ -14396,7 +16134,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -8790,7 +16251,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14405,7 +14998,8 @@
+@@ -14408,7 +16146,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -8800,7 +16261,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14435,7 +15029,7 @@
+@@ -14438,7 +16177,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8809,7 +16270,7 @@
        ;;
      esac
      ;;
-@@ -14458,7 +15052,7 @@
+@@ -14461,7 +16200,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -8818,7 +16279,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"`
-@@ -14481,20 +15075,17 @@
+@@ -14484,20 +16223,17 @@
    dynamic_linker=no
    ;;
  
@@ -8850,7 +16311,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14512,14 +15103,19 @@
+@@ -14515,14 +16251,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -8872,7 +16333,7 @@
    esac
    ;;
  
-@@ -14539,9 +15135,9 @@
+@@ -14542,9 +16283,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -8884,7 +16345,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14556,7 +15152,7 @@
+@@ -14559,7 +16300,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -8893,7 +16354,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14567,7 +15163,7 @@
+@@ -14570,7 +16311,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -8902,7 +16363,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14579,6 +15175,18 @@
+@@ -14582,6 +16323,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -8921,7 +16382,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14622,29 +15230,26 @@
+@@ -14625,29 +16378,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -8958,7 +16419,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,
-@@ -14654,6 +15259,18 @@
+@@ -14657,6 +16407,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8977,7 +16438,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14663,7 +15280,7 @@
+@@ -14666,7 +16428,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -8986,7 +16447,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14691,8 +15308,13 @@
+@@ -14694,8 +16456,13 @@
  
  openbsd*)
    version_type=sunos
@@ -9001,7 +16462,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
-@@ -14712,7 +15334,7 @@
+@@ -14715,7 +16482,7 @@
  
  os2*)
    libname_spec='$name'
@@ -9010,7 +16471,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14730,13 +15352,6 @@
+@@ -14733,13 +16500,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -9024,7 +16485,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14762,7 +15377,7 @@
+@@ -14765,7 +16525,7 @@
    need_version=yes
    ;;
  
@@ -9033,7 +16494,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'
-@@ -14795,6 +15410,29 @@
+@@ -14798,6 +16558,29 @@
    fi
    ;;
  
@@ -9063,17 +16524,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14810,12 +15448,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -14809,16 +16592,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-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" || \
@@ -9083,7 +16552,18 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14847,1125 +15490,300 @@
+@@ -14838,8 +16626,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
+@@ -14850,1146 +16638,321 @@
    enable_fast_install=needless
  fi
  
@@ -9112,7 +16592,17 @@
 -   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+
+-    ;;
+-  esac
+-fi
+ 
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
 +# 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
@@ -9170,7 +16660,12 @@
 +    lt_cv_prog_compiler_c_o_CXX \
 +    exclude_expsyms_CXX \
 +    include_expsyms_CXX; do
-+
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
 +    case $var in
 +    old_archive_cmds_CXX | \
 +    old_archive_from_new_cmds_CXX | \
@@ -9197,39 +16692,20 @@
 +  *'\$0 --fallback-echo"')
 +    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
      ;;
-   esac
--fi
++  esac
  
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
-+cfgfile="$ofile"
- 
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++cfgfile="$ofile"
  
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
  
 -  darwin*)
 -  # if libdl is installed we need to link against it
@@ -9246,8 +16722,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9290,8 +16765,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -9304,24 +16779,22 @@
 -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 build shared libraries.
++build_libtool_libs=$enable_shared
  
 -    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
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
  
 -fi
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
  
 -   ;;
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
  
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -9338,30 +16811,31 @@
 -/* 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
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
 -/* 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 host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
  
 -#undef shl_load
-+# A C compiler.
-+LTCC=$lt_LTCC
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9382,8 +16856,9 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
 -int
 -main ()
@@ -9419,8 +16894,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# A C compiler.
++LTCC=$lt_LTCC
  
 -ac_cv_func_shl_load=no
 -fi
@@ -9445,8 +16920,8 @@
 -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
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9489,8 +16964,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# A language-specific compiler.
++CC=$lt_compiler_CXX
  
 -ac_cv_lib_dld_shl_load=no
 -fi
@@ -9517,27 +16992,27 @@
 -/* 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
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# An ERE matcher.
++EGREP=$lt_EGREP
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# The linker used to build libraries.
++LD=$lt_LD_CXX
  
 -#undef dlopen
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9558,8 +17033,8 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# A BSD-compatible nm program.
++NM=$lt_NM
  
 -int
 -main ()
@@ -9595,8 +17070,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# A symbol stripping program
++STRIP=$lt_STRIP
  
 -ac_cv_func_dlopen=no
 -fi
@@ -9621,8 +17096,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9665,8 +17140,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: assembler.
-+AS="$AS"
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -9692,8 +17167,8 @@
 -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
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9736,9 +17211,8 @@
 -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
++# Used on cygwin: assembler.
++AS="$AS"
  
 -ac_cv_lib_svld_dlopen=no
 -fi
@@ -9764,8 +17238,8 @@
 -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
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -9808,8 +17282,9 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
 -ac_cv_lib_dld_dld_link=no
 -fi
@@ -9822,6 +17297,13 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
+ 
++# Object file suffix (normally "o").
++objext="$ac_objext"
+ 
+-fi
 +# Old archive suffix (normally "a").
 +libext="$libext"
  
@@ -9854,42 +17336,35 @@
 +# Do we need a version for libraries?
 +need_version=$need_version
  
+-    ;;
+-  esac
 +# Whether dlopen is supported.
 +dlopen_support=$enable_dlopen
  
--fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
- 
--    ;;
--  esac
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
- 
 -  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
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -  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
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
 -    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
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -    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
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_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
@@ -9902,20 +17377,20 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15484 "configure"
+-#line 15487 "configure"
 -#include "confdefs.h"
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Library versioning type.
-+version_type=$version_type
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
 -#include <stdio.h>
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -9926,9 +17401,8 @@
 -#    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
++# Library versioning type.
++version_type=$version_type
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -9951,25 +17425,23 @@
 -#    endif
 -#  endif
 -#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
 -#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
++# 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
  
 -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
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -  if (self)
 -    {
@@ -9977,8 +17449,11 @@
 -      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
++# 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
  
 -    exit (status);
 -}
@@ -10001,23 +17476,21 @@
 -  fi
 -fi
 -rm -fr conftest*
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+ 
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +# Commands used to build and install a shared archive.
 +archive_cmds=$lt_archive_cmds_CXX
 +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
 +postinstall_cmds=$lt_postinstall_cmds
 +postuninstall_cmds=$lt_postuninstall_cmds
  
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
- 
--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
- 
 -    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
@@ -10031,23 +17504,23 @@
 -  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 -  lt_status=$lt_dlunknown
 -  cat > conftest.$ac_ext <<EOF
--#line 15582 "configure"
+-#line 15585 "configure"
 -#include "confdefs.h"
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_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
  
 -#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
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -#include <stdio.h>
 +# Dependencies to place before the objects being linked to create a
 +# shared library.
-+predeps=$lt_predeps_CXX
++predep_objects=$lt_predep_objects_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -10060,7 +17533,7 @@
 -#endif
 +# Dependencies to place after the objects being linked to create a
 +# shared library.
-+postdeps=$lt_postdeps_CXX
++postdep_objects=$lt_postdep_objects_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. */
@@ -10083,27 +17556,35 @@
 -#    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
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
 -    exit (status);
 -}
 -EOF
@@ -10125,31 +17606,43 @@
 -  fi
 -fi
 -rm -fr conftest*
--
--
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
+ 
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
--
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
+ 
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
--
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
--
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+ 
 -  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
++# 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
+ 
 -
--
 -# 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
@@ -10433,12 +17926,33 @@
 -
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
+-
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+-
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag_CXX
+-
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag_CXX
+-
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+-
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+-
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
  
- # Command to use when deplibs_check_method == file_magic.
- file_magic_cmd=$lt_file_magic_cmd
-@@ -16074,7 +15892,10 @@
+ # 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
+@@ -16077,7 +17040,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.
@@ -10450,7 +17964,7 @@
  fi
  
  
-@@ -16146,16 +15967,42 @@
+@@ -16149,29 +17115,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -10492,10 +18006,21 @@
 +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
-@@ -16168,7 +16015,7 @@
+-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 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
@@ -10503,7 +18028,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16176,8 +16023,10 @@
+@@ -16179,21 +17171,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -10515,17 +18040,38 @@
 +  fi
    ;;
  esac
- echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16190,8 +16039,6 @@
- echo "$as_me:$LINENO: result: $enable_static" >&5
- echo "${ECHO_T}$enable_static" >&6
+-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
+-
 -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"
+@@ -16202,8 +17194,8 @@
+ lt_prog_compiler_pic_F77=
+ lt_prog_compiler_static_F77=
  
-@@ -16238,6 +16085,11 @@
+-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,'
+@@ -16241,6 +17233,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -10537,7 +18083,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16254,7 +16106,7 @@
+@@ -16257,7 +17254,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -10546,7 +18092,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16280,6 +16132,16 @@
+@@ -16283,6 +17280,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -10563,7 +18109,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16291,7 +16153,7 @@
+@@ -16294,7 +17301,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.
@@ -10572,7 +18118,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16314,13 +16176,20 @@
+@@ -16317,13 +17324,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -10595,7 +18141,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16335,15 +16204,15 @@
+@@ -16338,15 +17352,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -10617,7 +18163,7 @@
        ;;
  
      sunos4*)
-@@ -16352,7 +16221,7 @@
+@@ -16355,7 +17369,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -10626,7 +18172,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16365,6 +16234,17 @@
+@@ -16368,6 +17382,17 @@
        fi
        ;;
  
@@ -10644,7 +18190,28 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16399,18 +16279,20 @@
+@@ -16379,16 +17404,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
+@@ -16402,26 +17427,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -10652,13 +18219,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:16405: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16285: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16408: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17433: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16409: \$? = $ac_status" >&5
-+   echo "$as_me:16289: \$? = $ac_status" >&5
+-   echo "$as_me:16412: \$? = $ac_status" >&5
++   echo "$as_me:17437: \$? = $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
@@ -10670,25 +18237,37 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-@@ -16431,7 +16313,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
+     case $lt_prog_compiler_pic_F77 in
+@@ -16434,7 +17461,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=
-@@ -16441,6 +16323,48 @@
+@@ -16444,8 +17471,50 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-+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
++{ 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_F77+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -10715,8 +18294,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_F77" = xyes; then
 +    :
@@ -10725,10 +18304,12 @@
 +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
-@@ -16453,38 +16377,36 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -16456,60 +17525,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -10749,13 +18330,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:16472: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16389: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16475: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17537: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16476: \$? = $ac_status" >&5
-+   echo "$as_me:16393: \$? = $ac_status" >&5
+-   echo "$as_me:16479: \$? = $ac_status" >&5
++   echo "$as_me:17541: \$? = $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
@@ -10779,7 +18360,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16555,6 +16477,16 @@
+ 
+ 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;}
+@@ -16519,8 +17586,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=
+@@ -16558,6 +17625,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -10796,7 +18416,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16565,6 +16497,10 @@
+@@ -16568,6 +17645,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -10807,7 +18427,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16575,6 +16511,27 @@
+@@ -16578,6 +17659,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -10835,7 +18455,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16612,7 +16569,7 @@
+@@ -16615,7 +17717,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -10844,7 +18464,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16622,13 +16579,13 @@
+@@ -16625,13 +17727,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'
@@ -10861,7 +18481,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
-@@ -16637,23 +16594,70 @@
+@@ -16640,23 +17742,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -10870,10 +18490,9 @@
        else
 -	ld_shlibs=no
 +	ld_shlibs_F77=no
-       fi
-       ;;
- 
--    netbsd*)
++      fi
++      ;;
++
 +    interix3*)
 +      hardcode_direct_F77=no
 +      hardcode_shlibpath_var_F77=no
@@ -10918,9 +18537,10 @@
 +	link_all_deplibs_F77=no
 +      else
 +	ld_shlibs_F77=no
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -10938,7 +18558,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16667,13 +16671,40 @@
+@@ -16670,13 +17819,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10981,7 +18601,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16683,24 +16714,19 @@
+@@ -16686,24 +17862,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -11013,7 +18633,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16712,7 +16738,7 @@
+@@ -16715,7 +17886,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -11022,7 +18642,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16734,9 +16760,21 @@
+@@ -16737,9 +17908,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
@@ -11046,7 +18666,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16753,7 +16791,7 @@
+@@ -16756,7 +17939,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -11055,7 +18675,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`
-@@ -16772,8 +16810,12 @@
+@@ -16775,8 +17958,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -11068,7 +18688,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16781,22 +16823,23 @@
+@@ -16784,22 +17971,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -11099,17 +18719,14 @@
        program main
  
        end
-@@ -16810,8 +16853,7 @@
-   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'
-+	 { 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=$?
-@@ -16838,14 +16880,13 @@
+@@ -16836,19 +18024,20 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -11127,17 +18744,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16862,8 +16903,7 @@
-   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'
-+	 { 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=$?
-@@ -16895,13 +16935,11 @@
+@@ -16888,7 +18077,9 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -16898,13 +18089,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -11154,7 +18771,7 @@
  	fi
        fi
        ;;
-@@ -16914,7 +16952,7 @@
+@@ -16917,7 +18106,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -11163,7 +18780,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16924,68 +16962,68 @@
+@@ -16927,68 +18116,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -11276,7 +18893,7 @@
      fi
        ;;
  
-@@ -17019,8 +17057,8 @@
+@@ -17022,8 +18211,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -11287,7 +18904,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17028,7 +17066,7 @@
+@@ -17031,7 +18220,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -11296,7 +18913,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
-@@ -17042,49 +17080,64 @@
+@@ -17045,47 +18234,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -11365,30 +18982,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
 -	  hardcode_libdir_separator_F77=:
+-	  hardcode_direct_F77=no
+-	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
  	  hardcode_direct_F77=no
  	  hardcode_shlibpath_var_F77=no
- 	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_F77='-L$libdir'
--	  hardcode_direct_F77=no
--	  hardcode_shlibpath_var_F77=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_F77=yes
--	  ;;
--	*)
+ 	  ;;
+ 	*)
 -	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_F77=:
--	  hardcode_direct_F77=yes
--	  export_dynamic_flag_spec_F77='${wl}-E'
-+	*)
-+	  hardcode_direct_F77=yes
-+	  export_dynamic_flag_spec_F77='${wl}-E'
+ 	  hardcode_direct_F77=yes
+ 	  export_dynamic_flag_spec_F77='${wl}-E'
  
- 	  # hardcode_minus_L: Not really in the search PATH,
- 	  # but as the default location of the library.
-@@ -17096,7 +17149,7 @@
+@@ -17099,7 +18303,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -11397,7 +19009,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'
-@@ -17106,7 +17159,7 @@
+@@ -17109,7 +18313,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -11406,7 +19018,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
-@@ -17129,7 +17182,8 @@
+@@ -17132,7 +18336,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
@@ -11416,7 +19028,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17139,7 +17193,7 @@
+@@ -17142,7 +18347,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -11425,7 +19037,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17150,14 +17204,14 @@
+@@ -17153,14 +18358,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -11442,7 +19054,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'
-@@ -17169,13 +17223,13 @@
+@@ -17172,13 +18377,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -11458,7 +19070,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17183,21 +17237,15 @@
+@@ -17186,21 +18391,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -11484,7 +19096,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'
-@@ -17206,8 +17254,18 @@
+@@ -17209,8 +18408,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -11505,7 +19117,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17216,7 +17274,7 @@
+@@ -17219,7 +18428,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.
@@ -11514,7 +19126,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17264,36 +17322,45 @@
+@@ -17267,36 +18476,45 @@
        fi
        ;;
  
@@ -11581,8 +19193,14 @@
        ;;
  
      uts4*)
-@@ -17312,11 +17379,6 @@
- echo "${ECHO_T}$ld_shlibs_F77" >&6
+@@ -17311,15 +18529,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
+-echo "${ECHO_T}$ld_shlibs_F77" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6; }
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -11593,7 +19211,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17349,6 +17411,7 @@
+@@ -17337,8 +18550,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
+ 
+@@ -17352,6 +18565,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -11601,7 +19230,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17384,7 +17447,7 @@
+@@ -17374,20 +18588,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; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -11610,7 +19256,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17394,7 +17457,20 @@
+@@ -17397,7 +18611,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -11632,7 +19278,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17459,7 +17535,7 @@
+@@ -17462,7 +18689,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11641,7 +19287,7 @@
    ;;
  
  beos*)
-@@ -17468,7 +17544,7 @@
+@@ -17471,7 +18698,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -11650,7 +19296,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17484,7 +17560,7 @@
+@@ -17487,7 +18714,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -11659,7 +19305,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17496,7 +17572,8 @@
+@@ -17499,7 +18726,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -11669,7 +19315,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17526,7 +17603,7 @@
+@@ -17529,7 +18757,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -11678,7 +19324,7 @@
        ;;
      esac
      ;;
-@@ -17549,7 +17626,7 @@
+@@ -17552,7 +18780,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -11687,7 +19333,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"`
-@@ -17572,20 +17649,17 @@
+@@ -17575,20 +18803,17 @@
    dynamic_linker=no
    ;;
  
@@ -11719,7 +19365,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17603,14 +17677,19 @@
+@@ -17606,14 +18831,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -11741,7 +19387,7 @@
    esac
    ;;
  
-@@ -17630,9 +17709,9 @@
+@@ -17633,9 +18863,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -11753,7 +19399,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17647,7 +17726,7 @@
+@@ -17650,7 +18880,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -11762,7 +19408,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17658,7 +17737,7 @@
+@@ -17661,7 +18891,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -11771,7 +19417,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17670,6 +17749,18 @@
+@@ -17673,6 +18903,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -11790,7 +19436,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17713,29 +17804,26 @@
+@@ -17716,30 +18958,27 @@
    ;;
  
  # This must be Linux ELF.
@@ -11818,16 +19464,18 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
 +  # 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
++  # 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,
-@@ -17745,6 +17833,18 @@
+   # most powerpc-linux boxes support dynamic linking these days and
+@@ -17748,6 +18987,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -11846,7 +19494,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17754,7 +17854,7 @@
+@@ -17757,7 +19008,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -11855,7 +19503,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17782,8 +17882,13 @@
+@@ -17785,8 +19036,13 @@
  
  openbsd*)
    version_type=sunos
@@ -11870,7 +19518,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
-@@ -17803,7 +17908,7 @@
+@@ -17806,7 +19062,7 @@
  
  os2*)
    libname_spec='$name'
@@ -11879,7 +19527,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17821,13 +17926,6 @@
+@@ -17824,13 +19080,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -11893,7 +19541,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17853,7 +17951,7 @@
+@@ -17856,7 +19105,7 @@
    need_version=yes
    ;;
  
@@ -11902,7 +19550,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'
-@@ -17886,6 +17984,29 @@
+@@ -17889,6 +19138,29 @@
    fi
    ;;
  
@@ -11932,17 +19580,25 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17901,12 +18022,17 @@
- echo "${ECHO_T}$dynamic_linker" >&6
+@@ -17900,16 +19172,21 @@
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+-echo "${ECHO_T}$dynamic_linker" >&6
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
+-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" || \
@@ -11952,7 +19608,18 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17938,36 +18064,6 @@
+@@ -17929,8 +19206,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
+@@ -17941,36 +19218,6 @@
    enable_fast_install=needless
  fi
  
@@ -11989,7 +19656,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17982,7 +18078,8 @@
+@@ -17985,7 +19232,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.
@@ -11999,7 +19666,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 \
-@@ -18082,6 +18179,12 @@
+@@ -18085,6 +19333,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -12012,7 +19679,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18093,6 +18196,9 @@
+@@ -18096,6 +19350,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -12022,7 +19689,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18112,7 +18218,7 @@
+@@ -18115,7 +19372,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -12031,7 +19698,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18143,7 +18249,7 @@
+@@ -18146,7 +19403,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -12040,7 +19707,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18158,7 +18264,7 @@
+@@ -18161,7 +19418,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -12049,7 +19716,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18360,7 +18466,10 @@
+@@ -18363,7 +19620,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.
@@ -12061,7 +19728,15 @@
  fi
  
  
-@@ -18393,26 +18502,55 @@
+@@ -18384,7 +19644,6 @@
+ 	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ 
+ 
+-
+ # Source file extension for Java test sources.
+ ac_ext=java
+ 
+@@ -18396,26 +19655,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -12118,7 +19793,18 @@
  ## 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
-@@ -18439,18 +18577,20 @@
+@@ -18427,8 +19715,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
+@@ -18442,26 +19730,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -12126,13 +19812,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:18445: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18583: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18448: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19736: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18449: \$? = $ac_status" >&5
-+   echo "$as_me:18587: \$? = $ac_status" >&5
+-   echo "$as_me:18452: \$? = $ac_status" >&5
++   echo "$as_me:19740: \$? = $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
@@ -12144,7 +19830,28 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -18511,6 +18651,11 @@
+    $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"
+@@ -18475,8 +19765,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,'
+@@ -18514,6 +19804,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -12156,7 +19863,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18527,7 +18672,7 @@
+@@ -18530,7 +19825,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -12165,7 +19872,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18553,6 +18698,16 @@
+@@ -18556,6 +19851,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -12182,7 +19889,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18564,7 +18719,7 @@
+@@ -18567,7 +19872,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.
@@ -12191,7 +19898,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18587,13 +18742,20 @@
+@@ -18590,13 +19895,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -12214,7 +19921,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18608,15 +18770,15 @@
+@@ -18611,15 +19923,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -12236,7 +19943,7 @@
        ;;
  
      sunos4*)
-@@ -18625,7 +18787,7 @@
+@@ -18628,7 +19940,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -12245,7 +19952,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18638,6 +18800,17 @@
+@@ -18641,6 +19953,17 @@
        fi
        ;;
  
@@ -12263,7 +19970,28 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18672,18 +18845,20 @@
+@@ -18652,16 +19975,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
+@@ -18675,26 +19998,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -12271,13 +19999,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:18678: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18851: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18681: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20004: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18682: \$? = $ac_status" >&5
-+   echo "$as_me:18855: \$? = $ac_status" >&5
+-   echo "$as_me:18685: \$? = $ac_status" >&5
++   echo "$as_me:20008: \$? = $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
@@ -12289,25 +20017,37 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-@@ -18704,7 +18879,7 @@
+    $rm conftest*
+ 
  fi
+-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
  
+ if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
+     case $lt_prog_compiler_pic_GCJ in
+@@ -18707,7 +20032,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=
-@@ -18714,6 +18889,48 @@
+@@ -18717,8 +20042,50 @@
      ;;
  esac
  
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-+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
++{ 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_GCJ+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
@@ -12334,8 +20074,8 @@
 +   LDFLAGS="$save_LDFLAGS"
 +
 +fi
-+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
 +
 +if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
 +    :
@@ -12344,10 +20084,12 @@
 +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
-@@ -18726,38 +18943,36 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -18729,60 +20096,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -12368,13 +20110,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:18745: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18955: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18748: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20108: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18749: \$? = $ac_status" >&5
-+   echo "$as_me:18959: \$? = $ac_status" >&5
+-   echo "$as_me:18752: \$? = $ac_status" >&5
++   echo "$as_me:20112: \$? = $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
@@ -12398,7 +20140,46 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18828,6 +19043,16 @@
+ 
+ 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;}
+@@ -18792,8 +20157,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=
+@@ -18831,6 +20196,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -12415,7 +20196,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18838,6 +19063,10 @@
+@@ -18841,6 +20216,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -12426,7 +20207,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18848,6 +19077,27 @@
+@@ -18851,6 +20230,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -12454,7 +20235,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18885,7 +19135,7 @@
+@@ -18888,7 +20288,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -12463,7 +20244,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18895,13 +19145,13 @@
+@@ -18898,13 +20298,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'
@@ -12480,7 +20261,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
-@@ -18910,23 +19160,70 @@
+@@ -18913,23 +20313,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -12557,7 +20338,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18940,13 +19237,40 @@
+@@ -18943,13 +20390,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12600,7 +20381,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18956,24 +19280,19 @@
+@@ -18959,24 +20433,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12632,7 +20413,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18985,7 +19304,7 @@
+@@ -18988,7 +20457,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -12641,7 +20422,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -19007,9 +19326,21 @@
+@@ -19010,9 +20479,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
@@ -12665,7 +20446,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19026,7 +19357,7 @@
+@@ -19029,7 +20510,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -12674,7 +20455,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`
-@@ -19045,8 +19376,12 @@
+@@ -19048,8 +20529,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -12687,7 +20468,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19054,22 +19389,23 @@
+@@ -19057,22 +20542,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -12718,17 +20499,14 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19093,8 +19429,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -19121,14 +19456,13 @@
+@@ -19119,19 +20605,20 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -12746,17 +20524,17 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19155,8 +19489,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -19188,13 +19521,11 @@
+@@ -19181,7 +20668,9 @@
+   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 -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -19191,13 +20680,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -12773,7 +20551,7 @@
  	fi
        fi
        ;;
-@@ -19207,7 +19538,7 @@
+@@ -19210,7 +20697,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -12782,7 +20560,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19217,68 +19548,68 @@
+@@ -19220,68 +20707,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -12895,7 +20673,7 @@
      fi
        ;;
  
-@@ -19312,8 +19643,8 @@
+@@ -19315,8 +20802,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -12906,7 +20684,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19321,7 +19652,7 @@
+@@ -19324,7 +20811,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -12915,7 +20693,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
-@@ -19335,47 +19666,62 @@
+@@ -19338,47 +20825,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -13002,7 +20780,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19389,7 +19735,7 @@
+@@ -19392,7 +20894,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -13011,7 +20789,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'
-@@ -19399,7 +19745,7 @@
+@@ -19402,7 +20904,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -13020,7 +20798,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
-@@ -19422,7 +19768,8 @@
+@@ -19425,7 +20927,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
@@ -13030,7 +20808,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19432,7 +19779,7 @@
+@@ -19435,7 +20938,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -13039,7 +20817,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19443,14 +19790,14 @@
+@@ -19446,14 +20949,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -13056,7 +20834,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'
-@@ -19462,13 +19809,13 @@
+@@ -19465,13 +20968,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -13072,7 +20850,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19476,21 +19823,15 @@
+@@ -19479,21 +20982,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -13098,7 +20876,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'
-@@ -19499,8 +19840,18 @@
+@@ -19502,8 +20999,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13119,7 +20897,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19509,7 +19860,7 @@
+@@ -19512,7 +21019,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.
@@ -13128,7 +20906,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19557,36 +19908,45 @@
+@@ -19560,36 +21067,45 @@
        fi
        ;;
  
@@ -13195,8 +20973,14 @@
        ;;
  
      uts4*)
-@@ -19605,11 +19965,6 @@
- echo "${ECHO_T}$ld_shlibs_GCJ" >&6
+@@ -19604,15 +21120,10 @@
+     esac
+   fi
+ 
+-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
+-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
@@ -13207,7 +20991,18 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19642,6 +19997,7 @@
+@@ -19630,8 +21141,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
+ 
+@@ -19645,6 +21156,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -13215,7 +21010,24 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19677,7 +20033,7 @@
+@@ -19667,20 +21179,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; }
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -13224,7 +21036,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19687,7 +20043,20 @@
+@@ -19690,7 +21202,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13246,7 +21058,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19752,7 +20121,7 @@
+@@ -19755,7 +21280,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13255,7 +21067,7 @@
    ;;
  
  beos*)
-@@ -19761,7 +20130,7 @@
+@@ -19764,7 +21289,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -13264,7 +21076,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19777,7 +20146,7 @@
+@@ -19780,7 +21305,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -13273,7 +21085,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19789,7 +20158,8 @@
+@@ -19792,7 +21317,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -13283,7 +21095,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19819,7 +20189,7 @@
+@@ -19822,7 +21348,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13292,7 +21104,7 @@
        ;;
      esac
      ;;
-@@ -19842,7 +20212,7 @@
+@@ -19845,7 +21371,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -13301,7 +21113,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"`
-@@ -19865,20 +20235,17 @@
+@@ -19868,20 +21394,17 @@
    dynamic_linker=no
    ;;
  
@@ -13333,7 +21145,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19896,14 +20263,19 @@
+@@ -19899,14 +21422,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -13355,7 +21167,7 @@
    esac
    ;;
  
-@@ -19923,9 +20295,9 @@
+@@ -19926,9 +21454,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -13367,7 +21179,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19940,7 +20312,7 @@
+@@ -19943,7 +21471,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -13376,7 +21188,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19951,7 +20323,7 @@
+@@ -19954,7 +21482,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -13385,7 +21197,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19963,6 +20335,18 @@
+@@ -19966,6 +21494,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -13404,16 +21216,10 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -19983,1087 +20367,287 @@
-     ;;
-   *)
-     case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+@@ -19992,1081 +21532,281 @@
+       libsuff=32 shlibsuff=N32 libmagic=N32;;
+     *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+       libsuff=64 shlibsuff=64 libmagic=64-bit;;
 -    *) libsuff= shlibsuff= libmagic=never-match;;
 -    esac
 -    ;;
@@ -14246,12 +22052,94 @@
 -
 -
 -fi
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-
+-fi
+-
+-    ;;
+-  esac
+-
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+-
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20871 "configure"
+-#include "confdefs.h"
+-
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
+-
+-#include <stdio.h>
+-
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
+-
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
 +    *) libsuff= shlibsuff= libmagic=never-match;;
 +    esac
 +    ;;
@@ -14263,12 +22151,22 @@
 +  hardcode_into_libs=yes
 +  ;;
  
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +# No shared lib support for Linux oldld, aout, or coff.
 +linux*oldld* | linux*aout* | linux*coff*)
 +  dynamic_linker=no
 +  ;;
  
--fi
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
 +  version_type=linux
@@ -14284,13 +22182,32 @@
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
  
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
+   fi
+-fi
+-rm -fr conftest*
  
--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,
@@ -14300,6 +22217,9 @@
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
  
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -14312,7 +22232,21 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
  
--fi
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20969 "configure"
+-#include "confdefs.h"
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
@@ -14331,6 +22265,9 @@
 +  hardcode_into_libs=yes
 +  ;;
  
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
 +newsos6)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14338,7 +22275,7 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--fi
+-#include <stdio.h>
 +nto-qnx*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -14349,7 +22286,15 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--    ;;
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
 +openbsd*)
 +  version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
@@ -14358,10 +22303,7 @@
 +  case $host_os in
 +    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
 +    *)                         need_version=no  ;;
-   esac
--
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
++  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
@@ -14374,42 +22316,32 @@
 +	shlibpath_overrides_runpath=yes
 +	;;
 +      esac
-   else
--    enable_dlopen=no
++  else
 +    shlibpath_overrides_runpath=yes
-   fi
++  fi
 +  ;;
  
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
--    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
--
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20868 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
 -#endif
--
--#include <stdio.h>
 +os2*)
 +  libname_spec='$name'
 +  shrext_cmds=".dll"
@@ -14419,14 +22351,8 @@
 +  shlibpath_var=LIBPATH
 +  ;;
  
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
+-#ifdef __cplusplus
+-extern "C" void exit (int);
 -#endif
 +osf3* | osf4* | osf5*)
 +  version_type=osf
@@ -14439,27 +22365,11 @@
 +  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
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -14473,9 +22383,12 @@
 +  postinstall_cmds='chmod +x $lib'
 +  ;;
  
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +sunos4*)
 +  version_type=sunos
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -14488,11 +22401,20 @@
 +  need_version=yes
 +  ;;
  
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
 +sysv4 | sysv4.3*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14516,13 +22438,7 @@
 +      ;;
 +  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
@@ -14531,21 +22447,7 @@
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
- 
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -14567,81 +22469,13 @@
      esac
 -  else :
 -    # compilation failed
--    lt_cv_dlopen_self=no
+-    lt_cv_dlopen_self_static=no
    fi
 -fi
 -rm -fr conftest*
--
--
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
--
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self_static=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20966 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
++
 +uts4*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14649,52 +22483,38 @@
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
  
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
 +*)
 +  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
  
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self_static=no
--  fi
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
--rm -fr conftest*
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
  
-+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
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
++{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 +hardcode_action_GCJ=
 +if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 +   test -n "$runpath_var_GCJ" || \
 +   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
  
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_GCJ" != no &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -14712,23 +22532,9 @@
 +  # We cannot hardcode anything, or else we can only hardcode existing
 +  # directories.
 +  hardcode_action_GCJ=unsupported
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
--
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
-+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6
++fi
++{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
  
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -14744,7 +22550,7 @@
  fi
  
  
-@@ -21080,7 +20664,8 @@
+@@ -21083,7 +21823,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.
@@ -14754,7 +22560,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 \
-@@ -21180,6 +20765,12 @@
+@@ -21183,6 +21924,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -14767,7 +22573,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21191,6 +20782,9 @@
+@@ -21194,6 +21941,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -14777,7 +22583,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21210,7 +20804,7 @@
+@@ -21213,7 +21963,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -14786,7 +22592,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21241,7 +20835,7 @@
+@@ -21244,7 +21994,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -14795,7 +22601,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21256,7 +20850,7 @@
+@@ -21259,7 +22009,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -14804,7 +22610,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21458,7 +21052,10 @@
+@@ -21461,7 +22211,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.
@@ -14816,7 +22622,15 @@
  fi
  
  
-@@ -21497,15 +21094,42 @@
+@@ -21481,7 +22234,6 @@
+       RC)
+ 
+ 
+-
+ # Source file extension for RC test sources.
+ ac_ext=rc
+ 
+@@ -21500,15 +22252,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14859,7 +22673,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21521,7 +21145,8 @@
+@@ -21524,7 +22303,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.
@@ -14869,7 +22683,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 \
-@@ -21621,6 +21246,12 @@
+@@ -21624,6 +22404,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -14882,7 +22696,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21632,6 +21263,9 @@
+@@ -21635,6 +22421,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -14892,7 +22706,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21651,7 +21285,7 @@
+@@ -21654,7 +22443,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -14901,7 +22715,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21682,7 +21316,7 @@
+@@ -21685,7 +22474,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -14910,7 +22724,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21697,7 +21331,7 @@
+@@ -21700,7 +22489,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -14919,7 +22733,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21899,7 +21533,10 @@
+@@ -21902,7 +22691,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.
@@ -14931,7 +22745,7 @@
  fi
  
  
-@@ -21946,7 +21583,7 @@
+@@ -21949,7 +22741,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -14940,17 +22754,182 @@
  
  # Prevent multiple expansion
  
-@@ -22187,8 +21824,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22262,9 +21898,6 @@
+@@ -22004,8 +22796,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
+@@ -22031,17 +22823,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
+@@ -22056,32 +22848,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
+@@ -22090,8 +22883,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
+@@ -22117,11 +22910,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
+ 
+ 
+@@ -22129,8 +22922,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
+@@ -22140,8 +22933,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'
+@@ -22153,8 +22945,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
+@@ -22208,15 +23000,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
+@@ -22245,15 +23038,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'
+@@ -22265,9 +23057,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14960,27 +22939,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22298,8 +21931,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22403,8 +22035,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22483,9 +22114,6 @@
+@@ -22319,8 +23108,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcat=no
++	kde_cv_func_strlcat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22334,11 +23124,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
+@@ -22359,8 +23149,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'
+@@ -22425,9 +23214,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22441,8 +23231,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
+ 
+@@ -22466,15 +23256,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'
+@@ -22486,9 +23275,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -14990,247 +23028,1341 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22518,8 +22146,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22622,8 +22249,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -22713,8 +22339,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -22775,8 +22400,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -22844,8 +22468,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -22911,8 +22534,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23005,8 +22627,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23084,8 +22705,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -23169,8 +22789,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23238,8 +22857,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23334,8 +22952,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23399,8 +23016,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23495,8 +23111,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23560,8 +23175,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23657,8 +23271,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23722,8 +23335,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23820,8 +23432,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23886,8 +23497,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -23955,8 +23565,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -24107,8 +23716,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -24263,8 +23871,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -24329,8 +23936,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -24477,8 +24083,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -24633,8 +24238,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -24690,9 +24294,6 @@
+@@ -22539,8 +23325,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_strlcpy=no
++	kde_cv_func_strlcpy=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -22554,11 +23341,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
+@@ -22579,8 +23366,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'
+@@ -22644,9 +23430,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -22660,8 +23447,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
+-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
++echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; }
+ 
+ if test "x$kde_cv_func_strlcpy" = xyes; then
+ 
+@@ -22684,8 +23471,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
+@@ -22702,7 +23489,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -22734,20 +23521,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
++echo "${ECHO_T}$ac_cv_lib_util_main" >&6; }
+ if test $ac_cv_lib_util_main = yes; then
+   LIBUTIL="-lutil"
+ fi
+ 
+-   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
+@@ -22764,7 +23552,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -22796,21 +23584,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
++echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; }
+ if test $ac_cv_lib_compat_main = yes; then
+   LIBCOMPAT="-lcompat"
+ fi
+ 
+    kde_have_crypt=
+-   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
+@@ -22823,17 +23612,17 @@
+ 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;
+ }
+@@ -22865,19 +23654,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 \
+       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
+@@ -22890,17 +23680,17 @@
+ 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;
+ }
+@@ -22932,14 +23722,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_c_crypt=no
++	ac_cv_lib_c_crypt=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       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
+@@ -22965,13 +23756,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'
+@@ -23029,7 +23820,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
+       ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -23040,17 +23833,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'
+@@ -23108,7 +23901,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
+@@ -23120,8 +23915,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
+@@ -23134,8 +23929,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
+@@ -23148,17 +23943,17 @@
+ 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;
+ }
+@@ -23190,21 +23985,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      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
+@@ -23217,17 +24013,17 @@
+ 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;
+ }
+@@ -23259,21 +24055,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+    fi
+-   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
+@@ -23300,30 +24097,24 @@
+ 
+ #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;
+ }
+@@ -23355,17 +24146,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 \
+       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
+@@ -23378,17 +24170,17 @@
+ 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;
+ }
+@@ -23420,21 +24212,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_inet_ntoa=no
++	ac_cv_lib_nsl_inet_ntoa=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+    fi
+-   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
+@@ -23461,30 +24254,24 @@
+ 
+ #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;
+ }
+@@ -23516,17 +24303,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 \
+       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
+@@ -23539,17 +24327,17 @@
+ 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;
+ }
+@@ -23581,22 +24369,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_socket_connect=no
++	ac_cv_lib_socket_connect=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+    fi
+ 
+-   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
+@@ -23623,30 +24412,24 @@
+ 
+ #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;
+ }
+@@ -23678,17 +24461,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 \
+       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
+@@ -23701,17 +24485,17 @@
+ 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;
+ }
+@@ -23743,14 +24527,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_posix_remove=no
++	ac_cv_lib_posix_remove=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+@@ -23758,8 +24543,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
+@@ -23786,30 +24571,24 @@
+ 
+ #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;
+ }
+@@ -23841,18 +24620,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 \
+       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
+@@ -23865,17 +24645,17 @@
+ 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;
+ }
+@@ -23907,14 +24687,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ipc_shmat=no
++	ac_cv_lib_ipc_shmat=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+@@ -23928,18 +24709,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
+@@ -23976,15 +24758,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
+@@ -24018,9 +24801,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
+@@ -24044,25 +24828,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
+@@ -24080,18 +24858,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
+@@ -24128,15 +24907,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
+@@ -24170,9 +24950,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
+@@ -24196,25 +24977,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
+@@ -24228,8 +25003,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
+@@ -24242,17 +25017,17 @@
+ 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;
+ }
+@@ -24284,14 +25059,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 \
+       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
+@@ -24302,18 +25078,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
+@@ -24350,15 +25127,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
+@@ -24392,9 +25170,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
+@@ -24418,25 +25197,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
+@@ -24451,17 +25224,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
+@@ -24498,15 +25271,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
+@@ -24540,9 +25314,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
+@@ -24566,25 +25341,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
+@@ -24601,8 +25369,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
+@@ -24651,8 +25419,8 @@
+   (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
+@@ -24663,25 +25431,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 \
+       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'
+@@ -24693,9 +25461,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -15240,1391 +24372,7529 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24726,8 +24327,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24831,8 +24431,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -24932,8 +24531,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25007,8 +24605,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25071,8 +24668,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25134,8 +24730,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25175,8 +24770,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25232,8 +24826,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25273,8 +24866,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25338,8 +24930,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25370,10 +24961,8 @@
+@@ -24747,8 +25512,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_res_init=no
++	kde_cv_func_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -24762,11 +25528,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
+@@ -24787,8 +25553,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'
+@@ -24853,9 +25618,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -24869,8 +25635,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
+-echo "${ECHO_T}$kde_cv_proto_res_init" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5
++echo "${ECHO_T}$kde_cv_proto_res_init" >&6; }
+ 
+ if test "x$kde_cv_func_res_init" = xyes; then
+ 
+@@ -24897,8 +25663,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
+@@ -24911,17 +25677,17 @@
+ 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;
+ }
+@@ -24953,27 +25719,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
+-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
++echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; }
+ if test $ac_cv_lib_ucb_killpg = yes; then
+   LIBUCB="-lucb"
+ fi
+ 
+ 
+    case $host in     *-*-lynxos* )
+-        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
+@@ -24986,17 +25753,17 @@
+ 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;
+ }
+@@ -25028,22 +25795,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 \
+       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
+ 
+-     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
+@@ -25054,12 +25822,13 @@
+ 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;
+@@ -25092,20 +25861,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; }
+ 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.
+@@ -25118,10 +25888,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25159,10 +25930,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25196,30 +25968,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25257,10 +26031,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25294,23 +26069,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
+@@ -25322,10 +26100,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25359,26 +26138,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25386,8 +26159,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++		   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25396,22 +26170,22 @@
+ 
+   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;
+@@ -25435,28 +26209,27 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -25484,8 +25073,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25547,8 +25135,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25588,8 +25175,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25645,8 +25231,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25686,8 +25271,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25751,8 +25335,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25783,10 +25366,8 @@
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+-   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
+@@ -25467,12 +26240,13 @@
+ 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;
+@@ -25505,20 +26279,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; }
+ 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.
+@@ -25531,10 +26306,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25572,10 +26348,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25609,30 +26386,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25670,10 +26449,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25707,23 +26487,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
+@@ -25735,10 +26518,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25772,26 +26556,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -25799,8 +26577,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++		   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -25809,22 +26588,22 @@
+ 
+   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;
+@@ -25848,28 +26627,27 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -25897,8 +25478,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -25960,8 +25540,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26001,8 +25580,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26058,8 +25636,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26099,8 +25676,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26164,8 +25740,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26196,10 +25771,8 @@
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+-  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
+@@ -25880,12 +26658,13 @@
+ 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;
+@@ -25918,20 +26697,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; }
+ 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.
+@@ -25944,10 +26724,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -25985,10 +26766,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26022,30 +26804,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26083,10 +26867,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26120,23 +26905,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
+@@ -26148,10 +26936,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26185,26 +26974,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26212,8 +26995,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++		   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26222,22 +27006,22 @@
+ 
+   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;
+@@ -26261,28 +27045,27 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -26310,8 +25883,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26373,8 +25945,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26414,8 +25985,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26471,8 +26041,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26512,8 +26081,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26577,8 +26145,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26609,10 +26176,8 @@
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+ 
+-  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
+@@ -26293,12 +27076,13 @@
+ 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;
+@@ -26331,20 +27115,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; }
+ 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.
+@@ -26357,10 +27142,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26398,10 +27184,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26435,30 +27222,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26496,10 +27285,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26533,23 +27323,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
+@@ -26561,10 +27354,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26598,26 +27392,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
+ 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 *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -26625,8 +27413,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char *)); }
+-unsigned long ulongval () { return (long) (sizeof (char *)); }
++		   typedef char * ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -26635,22 +27424,22 @@
+ 
+   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;
+@@ -26674,30 +27463,29 @@
+ 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 *)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char *), 77
++echo "$as_me: error: cannot compute sizeof (char *)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -26731,8 +26296,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26803,8 +26367,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26874,8 +26437,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26937,8 +26499,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -26978,8 +26539,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27035,8 +26595,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27076,8 +26635,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27141,8 +26699,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27173,10 +26730,8 @@
+   ac_cv_sizeof_char_p=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
+ _ACEOF
+ 
+ 
+ 
+-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
+@@ -26710,17 +27498,17 @@
+ 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;
+ }
+@@ -26752,14 +27540,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 \
+       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"
+@@ -26768,8 +27557,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
+-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
++echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26782,17 +27571,17 @@
+ 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;
+ }
+@@ -26824,14 +27613,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
+-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; }
+ if test $ac_cv_lib_dld_shl_unload = yes; then
+ 
+ LIBDL="-ldld"
+@@ -26845,8 +27635,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
+@@ -26857,12 +27647,13 @@
+ 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;
+@@ -26895,20 +27686,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; }
+ 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.
+@@ -26921,10 +27713,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26962,10 +27755,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -26999,30 +27793,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27060,10 +27856,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27097,23 +27894,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
+@@ -27125,10 +27925,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27162,26 +27963,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27189,8 +27984,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (size_t)); }
+-unsigned long ulongval () { return (long) (sizeof (size_t)); }
++		   typedef size_t ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27199,22 +27995,22 @@
+ 
+   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;
+@@ -27238,29 +28034,28 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (size_t), 77
++echo "$as_me: error: cannot compute sizeof (size_t)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -27288,8 +26843,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27351,8 +26905,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27392,8 +26945,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27449,8 +27001,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27490,8 +27041,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27555,8 +27105,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -27587,10 +27136,8 @@
+   ac_cv_sizeof_size_t=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
++echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+ _ACEOF
+ 
+ 
+-  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
+@@ -27271,12 +28066,13 @@
+ 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;
+@@ -27309,20 +28105,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; }
+ 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.
+@@ -27335,10 +28132,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27376,10 +28174,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27413,30 +28212,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27474,10 +28275,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27511,23 +28313,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
+@@ -27539,10 +28344,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -27576,26 +28382,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27603,8 +28403,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (unsigned long)); }
+-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
++		   typedef unsigned long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -27613,22 +28414,22 @@
+ 
+   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;
+@@ -27652,30 +28453,29 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
++echo "$as_me: error: cannot compute sizeof (unsigned long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
+   ac_cv_sizeof_unsigned_long=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
+ _ACEOF
+ 
+ 
+ 
+-  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
-@@ -27701,8 +27248,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+ /* confdefs.h.  */
+ _ACEOF
+@@ -27717,15 +28517,15 @@
    ac_status=$?
-@@ -27783,8 +27329,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -27884,8 +27429,7 @@
-   cat conftest.err >&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!
+@@ -27737,18 +28537,18 @@
+    { (exit 1); exit 1; }; }
+ 
+ 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'
+@@ -27804,8 +28604,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -27819,26 +28620,26 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
+-echo "${ECHO_T}$kde_cv_val_pie_support" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5
++echo "${ECHO_T}$kde_cv_val_pie_support" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
+-echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5
++echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; }
+ 
+-  # Check whether --enable-pie or --disable-pie was given.
++  # Check whether --enable-pie was given.
+ if test "${enable_pie+set}" = set; then
+-  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=""
+@@ -27857,18 +28658,19 @@
+ for ac_header in crt_externs.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -27905,15 +28707,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
+@@ -27947,9 +28750,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
+@@ -27973,25 +28777,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
+@@ -28003,8 +28801,8 @@
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
+-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
++echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; }
+ if test "${ac_cv_func__NSGetEnviron+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28031,30 +28829,24 @@
+ 
+ #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;
+ }
+@@ -28086,13 +28878,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
+@@ -28113,9 +28906,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
+@@ -28141,30 +28934,24 @@
+ 
+ #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;
+ }
+@@ -28196,13 +28983,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
+@@ -28219,32 +29008,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
+ 
+@@ -28260,8 +29049,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
+@@ -28366,6 +29155,7 @@
+     fi
+   done
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = NO
+ 
+@@ -28423,7 +29213,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}/` \
+@@ -28471,6 +29261,7 @@
+   done
+ done
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = NO
+@@ -28481,7 +29272,7 @@
+ *-*-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.
+@@ -28489,13 +29280,13 @@
+ acfindx:
+ 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_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`
+     # 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
+@@ -28503,7 +29294,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
+@@ -28512,7 +29303,7 @@
+     esac
+   fi
+   cd ..
+-  rm -fr conftest.dir
++  rm -f -r conftest.dir
+ fi
+ 
+   if test -z "$ac_x_includes"; then
+@@ -28556,12 +29347,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; }
+ fi
+ 
+ if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
+@@ -28589,8 +29380,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
+@@ -28603,17 +29394,17 @@
+ 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;
+ }
+@@ -28645,14 +29436,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 \
+       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
+@@ -28661,8 +29453,8 @@
+ 
+ LIB_X11='-lX11 $(LIBSOCKET)'
+ 
+-echo "$as_me:$LINENO: checking for libXext" >&5
+-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libXext" >&5
++echo $ECHO_N "checking for libXext... $ECHO_C" >&6; }
+ if test "${kde_cv_have_libXext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -28722,9 +29514,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -28734,8 +29527,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
+-echo "${ECHO_T}$kde_cv_have_libXext" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
++echo "${ECHO_T}$kde_cv_have_libXext" >&6; }
+ 
+ if test "$kde_cv_have_libXext" = "no"; then
+   { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
+@@ -28881,8 +29674,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"
+@@ -28893,9 +29686,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
+@@ -28907,17 +29700,17 @@
+ 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;
+ }
+@@ -28949,14 +29742,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
++ac_res=`eval echo '${'$as_ac_Lib'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+   LIBPTHREAD="$PTHREAD_LIBS_save"
+ fi
+@@ -28969,8 +29764,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
+@@ -28983,17 +29778,17 @@
+ 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;
+ }
+@@ -29025,14 +29820,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
+ if test $ac_cv_lib_pthread_pthread_create = yes; then
+   LIBPTHREAD="-lpthread"
+ fi
+@@ -29040,8 +29836,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
+@@ -29082,17 +29878,18 @@
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -28065,8 +27609,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -28175,8 +27718,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -28400,8 +27942,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -28624,8 +28165,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -28701,8 +28241,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -28928,8 +28467,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -29004,8 +28542,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -29065,8 +28602,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -29149,8 +28685,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29243,8 +28778,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -29418,8 +28952,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -29517,8 +29050,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -29605,8 +29137,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -29683,8 +29214,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -29737,7 +29267,7 @@
+   (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 \
+       conftest$ac_exeext conftest.$ac_ext
+     LIBS=$kde_safe_libs
+@@ -29108,16 +29905,15 @@
+       USE_THREADS=""
+       if test -z "$LIBPTHREAD"; then
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
+-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
++echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; }
+ kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
+-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'
+@@ -29170,7 +29966,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -29184,13 +29982,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-D_THREAD_SAFE -pthread"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29202,16 +30000,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'
+@@ -29264,7 +30061,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -29278,13 +30077,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  USE_THREADS="-mt"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -29311,17 +30110,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
+@@ -29339,21 +30138,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
+ 
+@@ -29372,14 +30171,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
+@@ -29439,8 +30238,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29454,8 +30254,8 @@
+ _ACEOF
+ 
+   LIBZ="$ac_cv_lib_z"
+-  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
+-echo "${ECHO_T}$ac_cv_lib_z" >&6
++  { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
++echo "${ECHO_T}$ac_cv_lib_z" >&6; }
+ else
+   { { echo "$as_me:$LINENO: error: not found.
+           Possibly configure picks up an outdated version
+@@ -29475,8 +30275,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
+@@ -29538,9 +30338,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -29555,19 +30356,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=""
+ 
+ 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
+@@ -29626,8 +30427,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29638,14 +30440,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
+@@ -29704,8 +30506,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"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -29716,11 +30519,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=
+ 
+@@ -29740,7 +30543,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29740: $i/$j" >&5
-+    echo "configure: 29270: $i/$j" >&5
+-    echo "configure: 29743: $i/$j" >&5
++    echo "configure: 30546: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -30035,7 +29565,7 @@
+@@ -29787,14 +30590,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
+ 
+@@ -29837,8 +30640,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
+@@ -29847,8 +30650,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
+@@ -29862,10 +30665,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
+@@ -29875,7 +30677,8 @@
+     fi
+ 
+ 
+-fi;
++fi
++
+ 
+ USING_QT_MT=""
+ 
+@@ -29895,13 +30698,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
+@@ -29973,8 +30776,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"
+@@ -29983,34 +30786,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.
+-if test "${with_qt_includes+set}" = set; then
+-  withval="$with_qt_includes"
+ 
++# Check whether --with-qt-includes was given.
++if test "${with_qt_includes+set}" = set; then
++  withval=$with_qt_includes;
+        ac_qt_includes="$withval"
+ 
+-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
+@@ -30038,7 +30841,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 30038: $i/$j" >&5
-+    echo "configure: 29568: $i/$j" >&5
+-    echo "configure: 30041: $i/$j" >&5
++    echo "configure: 30844: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30712,8 +30242,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -30872,7 +30401,7 @@
+@@ -30075,8 +30878,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'
+@@ -30213,13 +31015,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"
+@@ -30228,15 +31030,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'
+@@ -30357,12 +31158,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; }
+ 
+ fi
+ 
+@@ -30400,14 +31201,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
+ 
+@@ -30450,8 +31251,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.
+@@ -30472,22 +31273,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
+ 
+@@ -30530,12 +31331,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
+@@ -30565,10 +31366,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
+ 
+@@ -30591,22 +31392,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
+ 
+@@ -30629,13 +31430,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
+@@ -30666,15 +31467,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'
+@@ -30733,8 +31533,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 \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_save_LIBS"
+@@ -30751,12 +31552,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
+ 
+@@ -30787,15 +31588,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
+ 
+@@ -30819,11 +31620,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}
+@@ -30875,7 +31676,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30875: $i/$j" >&5
-+    echo "configure: 30404: $i/$j" >&5
+-    echo "configure: 30878: $i/$j" >&5
++    echo "configure: 31679: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30902,7 +30431,7 @@
+@@ -30905,7 +31706,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30905: $i/$j" >&5
-+    echo "configure: 30434: $i/$j" >&5
+-    echo "configure: 30908: $i/$j" >&5
++    echo "configure: 31709: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30920,7 +30449,7 @@
+@@ -30923,7 +31724,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30923: $i/$j" >&5
-+    echo "configure: 30452: $i/$j" >&5
+-    echo "configure: 30926: $i/$j" >&5
++    echo "configure: 31727: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32443,7 +31972,7 @@
- do
-   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
-   do
--    echo "configure: 32446: $i/$j" >&5
-+    echo "configure: 31975: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       KDE_XSL_STYLESHEET=$i
-@@ -32702,8 +32231,7 @@
-   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'
-+	 { 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
+@@ -30982,12 +31783,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}"
+@@ -30996,8 +31797,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"
+@@ -31035,8 +31836,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
+@@ -31079,8 +31880,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.
+@@ -31112,10 +31913,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=""
+@@ -31129,13 +31929,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
+@@ -31246,15 +32047,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'
+@@ -31306,8 +32106,8 @@
    ac_status=$?
-@@ -32798,8 +32326,7 @@
-   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'
-+	 { 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
+   (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.
+@@ -31346,8 +32146,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
+@@ -31355,8 +32155,8 @@
    ac_status=$?
-@@ -32892,8 +32419,7 @@
-   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'
-+	 { 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
+   (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
+@@ -31549,15 +32349,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'
+@@ -31609,8 +32408,8 @@
    ac_status=$?
-@@ -33015,8 +32541,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; 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.
+@@ -31649,8 +32448,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
+@@ -31658,8 +32457,8 @@
    ac_status=$?
-@@ -33073,8 +32598,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (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
+@@ -31751,22 +32550,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
+@@ -31799,14 +32598,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
+ 
+@@ -31849,8 +32648,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.
+@@ -31861,21 +32660,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
+ 
+@@ -31918,8 +32717,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.
+@@ -31930,22 +32729,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
+ 
+@@ -31988,8 +32787,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
+@@ -32002,21 +32801,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
+ 
+@@ -32059,8 +32858,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
+@@ -32073,22 +32872,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
+ 
+@@ -32131,12 +32930,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
+@@ -32165,14 +32964,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
+ 
+@@ -32215,8 +33014,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.
+@@ -32227,21 +33026,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
+ 
+@@ -32284,8 +33083,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.
+@@ -32296,8 +33095,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
+@@ -32305,14 +33104,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
+ 
+@@ -32355,8 +33154,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.
+@@ -32367,8 +33166,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
+@@ -32376,14 +33175,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
+ 
+@@ -32426,12 +33225,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
+@@ -32446,7 +33245,7 @@
+ do
+   for j in apps/ksgmltools2/customization/kde-chunk.xsl;
+   do
+-    echo "configure: 32449: $i/$j" >&5
++    echo "configure: 33248: $i/$j" >&5
+     if test -r "$i/$j"; then
+       echo "taking that" >&5
+       KDE_XSL_STYLESHEET=$i
+@@ -32608,13 +33407,12 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
+-echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking grepping for visibility push/pop in headers" >&5
++echo $ECHO_N "checking grepping for visibility push/pop in headers... $ECHO_C" >&6; }
+ 
+   if test "x$GXX" = "xyes"; then
+ 
+-
+-     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'
+@@ -32635,13 +33433,13 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "GCC visibility push" >/dev/null 2>&1; then
+ 
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++      { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+       kde_stdc_visibility_patched=yes
+ else
+ 
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
+                    visibility support. Disabling -fvisibility=hidden" >&5
+ echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
+@@ -32661,16 +33459,15 @@
+ 
+     kde_have_gcc_visibility=no
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
+-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
++echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6; }
+ kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
+-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'
+@@ -32723,7 +33520,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -32737,28 +33536,27 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+       kde_have_gcc_visibility=yes
+-                              # Check whether --enable-gcc-hidden-visibility or --disable-gcc-hidden-visibility was given.
++                              # Check whether --enable-gcc-hidden-visibility was given.
+ if test "${enable_gcc_hidden_visibility+set}" = set; then
+-  enableval="$enable_gcc_hidden_visibility"
+-  kde_have_gcc_visibility=$enableval
++  enableval=$enable_gcc_hidden_visibility; kde_have_gcc_visibility=$enableval
+ else
+   kde_have_gcc_visibility=no
+-fi;
++fi
++
+ 
+-      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
+-echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
++      { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
++echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
+ if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-           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'
+@@ -32819,8 +33617,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_qt_gcc_visibility_patched=yes
++	kde_cv_val_qt_gcc_visibility_patched=yes
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+           CXXFLAGS=$safe_CXXFLAGS
+@@ -32833,21 +33632,20 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
+-echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_qt_gcc_visibility_patched" >&5
++echo "${ECHO_T}$kde_cv_val_qt_gcc_visibility_patched" >&6; }
+ 
+       if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ 
+-    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
+-echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
++echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6; }
+ if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-         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'
+@@ -32913,8 +33711,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_val_gcc_visibility_bug=yes
++	kde_cv_val_gcc_visibility_bug=yes
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -32929,8 +33728,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
+-echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
++echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6; }
+ 
+     if test x$kde_cv_val_gcc_visibility_bug = xno; then
+       CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
+@@ -32946,8 +33745,8 @@
+       fi
+ 
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -32960,10 +33759,9 @@
+ 
+   want_pam=
+ 
+-# Check whether --with-pam or --without-pam was given.
++# Check whether --with-pam was given.
+ if test "${with_pam+set}" = set; then
+-  withval="$with_pam"
+-   if test "x$withval" = "xyes"; then
++  withval=$with_pam;  if test "x$withval" = "xyes"; then
+         want_pam=yes
+         pam_service=kde
+       elif test "x$withval" = "xno"; then
+@@ -32975,13 +33773,14 @@
+ 
+ else
+    pam_service=kde
+-fi;
++fi
++
+ 
+   use_pam=
+   PAMLIBS=
+   if test "x$want_pam" != xno; then
+-    echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
+-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
++echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_pam_pam_start+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32994,17 +33793,17 @@
+ 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 pam_start ();
+ int
+ main ()
+ {
+-pam_start ();
++return pam_start ();
+   ;
+   return 0;
+ }
+@@ -33036,28 +33835,29 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pam_pam_start=no
++	ac_cv_lib_pam_pam_start=no
+ fi
++
+ 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_pam_pam_start" >&5
+-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
++echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
+ if test $ac_cv_lib_pam_pam_start = yes; then
+ 
+       if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
++echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
++echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
+-echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
++echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33094,15 +33894,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 security/pam_appl.h presence" >&5
+-echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
++echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33136,9 +33937,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
+@@ -33162,42 +33964,35 @@
+ echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
++echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_security_pam_appl_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
++echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_security_pam_appl_h = yes; then
+    pam_header=security/pam_appl.h
+ else
+    if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
+-echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
++echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
++echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5
+-echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5
++echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33234,15 +34029,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 pam/pam_appl.h presence" >&5
+-echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5
++echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33276,9 +34072,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
+@@ -33302,25 +34099,18 @@
+ echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
+-echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
++echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_pam_pam_appl_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
++echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_pam_pam_appl_h = yes; then
+@@ -33367,8 +34157,8 @@
+ 
+       fi
+ 
+-            echo "$as_me:$LINENO: checking for const pam_message" >&5
+-echo $ECHO_N "checking for const pam_message... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking for const pam_message" >&5
++echo $ECHO_N "checking for const pam_message... $ECHO_C" >&6; }
+       cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -33391,11 +34181,11 @@
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "const struct pam_message" >/dev/null 2>&1; then
+-  echo "$as_me:$LINENO: result: const: Linux-type PAM" >&5
+-echo "${ECHO_T}const: Linux-type PAM" >&6
++  { echo "$as_me:$LINENO: result: const: Linux-type PAM" >&5
++echo "${ECHO_T}const: Linux-type PAM" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: nonconst: Sun-type PAM" >&5
+-echo "${ECHO_T}nonconst: Sun-type PAM" >&6
++  { echo "$as_me:$LINENO: result: nonconst: Sun-type PAM" >&5
++echo "${ECHO_T}nonconst: Sun-type PAM" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define PAM_MESSAGE_NONCONST 1
+@@ -33406,8 +34196,8 @@
+ rm -f conftest*
+ 
+ else
+-  echo "$as_me:$LINENO: result: not found - assume const, Linux-type PAM" >&5
+-echo "${ECHO_T}not found - assume const, Linux-type PAM" >&6
++  { echo "$as_me:$LINENO: result: not found - assume const, Linux-type PAM" >&5
++echo "${ECHO_T}not found - assume const, Linux-type PAM" >&6; }
+ fi
+ rm -f conftest*
+ 
+@@ -33419,8 +34209,8 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for getspent in -lshadow" >&5
+-echo $ECHO_N "checking for getspent in -lshadow... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for getspent in -lshadow" >&5
++echo $ECHO_N "checking for getspent in -lshadow... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_shadow_getspent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33433,17 +34223,17 @@
+ 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 getspent ();
+ int
+ main ()
+ {
+-getspent ();
++return getspent ();
+   ;
+   return 0;
+ }
+@@ -33475,21 +34265,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_shadow_getspent=no
++	ac_cv_lib_shadow_getspent=no
+ fi
++
+ 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_shadow_getspent" >&5
+-echo "${ECHO_T}$ac_cv_lib_shadow_getspent" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_shadow_getspent" >&5
++echo "${ECHO_T}$ac_cv_lib_shadow_getspent" >&6; }
+ if test $ac_cv_lib_shadow_getspent = yes; then
+    LIBSHADOW="-lshadow"
+       ac_use_shadow=yes
+ 
+ else
+-         echo "$as_me:$LINENO: checking for getspent in -lgen" >&5
+-echo $ECHO_N "checking for getspent in -lgen... $ECHO_C" >&6
++         { echo "$as_me:$LINENO: checking for getspent in -lgen" >&5
++echo $ECHO_N "checking for getspent in -lgen... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_gen_getspent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33502,17 +34293,17 @@
+ 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 getspent ();
+ int
+ main ()
+ {
+-getspent ();
++return getspent ();
+   ;
+   return 0;
+ }
+@@ -33544,21 +34335,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_gen_getspent=no
++	ac_cv_lib_gen_getspent=no
+ fi
++
+ 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_gen_getspent" >&5
+-echo "${ECHO_T}$ac_cv_lib_gen_getspent" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspent" >&5
++echo "${ECHO_T}$ac_cv_lib_gen_getspent" >&6; }
+ if test $ac_cv_lib_gen_getspent = yes; then
+    LIBGEN="-lgen"
+           ac_use_shadow=yes
+ 
+ else
+-   echo "$as_me:$LINENO: checking for getspent" >&5
+-echo $ECHO_N "checking for getspent... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for getspent" >&5
++echo $ECHO_N "checking for getspent... $ECHO_C" >&6; }
+ if test "${ac_cv_func_getspent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -33585,30 +34377,24 @@
+ 
+ #undef getspent
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char getspent ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getspent) || defined (__stub___getspent)
++#if defined __stub_getspent || defined __stub___getspent
+ choke me
+-#else
+-char (*f) () = getspent;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != getspent;
++return getspent ();
+   ;
+   return 0;
+ }
+@@ -33640,13 +34426,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_getspent=no
++	ac_cv_func_getspent=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getspent" >&5
+-echo "${ECHO_T}$ac_cv_func_getspent" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getspent" >&5
++echo "${ECHO_T}$ac_cv_func_getspent" >&6; }
+ if test $ac_cv_func_getspent = yes; then
+    ac_use_shadow=yes
+ else
+@@ -33662,14 +34449,13 @@
+ 
+ 
+ 
+-  echo "$as_me:$LINENO: checking for shadow passwords" >&5
+-echo $ECHO_N "checking for shadow passwords... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for shadow passwords" >&5
++echo $ECHO_N "checking for shadow passwords... $ECHO_C" >&6; }
+ 
+ 
+-# Check whether --with-shadow or --without-shadow was given.
++# Check whether --with-shadow was given.
+ if test "${with_shadow+set}" = set; then
+-  withval="$with_shadow"
+-   if test "x$withval" != "xno"; then
++  withval=$with_shadow;  if test "x$withval" != "xno"; then
+         use_shadow=yes
+       else
+         use_shadow=no
+@@ -33679,19 +34465,20 @@
+ 
+       use_shadow="$ac_use_shadow"
+ 
+-fi;
++fi
++
+ 
+   if test "x$use_shadow" = xyes; then
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SHADOW 1
+ _ACEOF
+ 
+   else
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     LIBSHADOW=
+     LIBGEN=
+   fi
+@@ -33731,10 +34518,9 @@
+ 
+ 
+ 
+-# Check whether --with-kdm-pam or --without-kdm-pam was given.
++# Check whether --with-kdm-pam was given.
+ if test "${with_kdm_pam+set}" = set; then
+-  withval="$with_kdm_pam"
+-   if test "x$use_pam" = xyes; then
++  withval=$with_kdm_pam;  if test "x$use_pam" = xyes; then
+         KDM_PAM_SERVICE=$withval
+       else
+         { { echo "$as_me:$LINENO: error: Cannot use use --with-kdm-pam, as no PAM was detected.
+@@ -33749,10 +34535,11 @@
+         KDM_PAM_SERVICE="$pam_service"
+       fi
+ 
+-fi;
++fi
++
+     if test -n "$KDM_PAM_SERVICE"; then
+-      echo "$as_me:$LINENO: result: The PAM service used by kdm will be $KDM_PAM_SERVICE" >&5
+-echo "${ECHO_T}The PAM service used by kdm will be $KDM_PAM_SERVICE" >&6
++      { echo "$as_me:$LINENO: result: The PAM service used by kdm will be $KDM_PAM_SERVICE" >&5
++echo "${ECHO_T}The PAM service used by kdm will be $KDM_PAM_SERVICE" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KDM_PAM_SERVICE "$KDM_PAM_SERVICE"
+@@ -33763,10 +34550,9 @@
+ 
+ 
+ 
+-# Check whether --with-kcp-pam or --without-kcp-pam was given.
++# Check whether --with-kcp-pam was given.
+ if test "${with_kcp_pam+set}" = set; then
+-  withval="$with_kcp_pam"
+-   if test "x$use_pam" = xyes; then
++  withval=$with_kcp_pam;  if test "x$use_pam" = xyes; then
+         KCHECKPASS_PAM_SERVICE=$withval
+       else
+         { { echo "$as_me:$LINENO: error: Cannot use use --with-kcp-pam, as no PAM was detected.
+@@ -33781,10 +34567,11 @@
+         KCHECKPASS_PAM_SERVICE="$pam_service"
+       fi
+ 
+-fi;
++fi
++
+     if test -n "$KCHECKPASS_PAM_SERVICE"; then
+-      echo "$as_me:$LINENO: result: The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&5
+-echo "${ECHO_T}The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&6
++      { echo "$as_me:$LINENO: result: The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&5
++echo "${ECHO_T}The PAM service used by kcheckpass will be $KCHECKPASS_PAM_SERVICE" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KCHECKPASS_PAM_SERVICE "$KCHECKPASS_PAM_SERVICE"
+@@ -33795,10 +34582,9 @@
+ 
+ 
+ 
+-# Check whether --with-kss-pam or --without-kss-pam was given.
++# Check whether --with-kss-pam was given.
+ if test "${with_kss_pam+set}" = set; then
+-  withval="$with_kss_pam"
+-   if test "x$use_pam" = xyes; then
++  withval=$with_kss_pam;  if test "x$use_pam" = xyes; then
+         KSCREENSAVER_PAM_SERVICE=$withval
+       else
+         { { echo "$as_me:$LINENO: error: Cannot use use --with-kss-pam, as no PAM was detected.
+@@ -33813,10 +34599,11 @@
+         KSCREENSAVER_PAM_SERVICE="$pam_service"
+       fi
+ 
+-fi;
++fi
++
+     if test -n "$KSCREENSAVER_PAM_SERVICE"; then
+-      echo "$as_me:$LINENO: result: The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&5
+-echo "${ECHO_T}The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&6
++      { echo "$as_me:$LINENO: result: The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&5
++echo "${ECHO_T}The PAM service used by kscreensaver will be $KSCREENSAVER_PAM_SERVICE" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KSCREENSAVER_PAM_SERVICE "$KSCREENSAVER_PAM_SERVICE"
+@@ -33834,9 +34621,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
+@@ -33884,12 +34671,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_hdr" | $as_tr_cpp` 1
+@@ -33901,13 +34690,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
+@@ -33915,77 +34703,29 @@
+ 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'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&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
++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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
    ac_status=$?
-@@ -33213,8 +32737,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+@@ -34007,34 +34747,43 @@
    ac_status=$?
-@@ -33454,8 +32977,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+   (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
+@@ -34042,77 +34791,29 @@
+ 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'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&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
++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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>conftest.er1
    ac_status=$?
-@@ -33523,8 +33045,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+@@ -34134,30 +34835,40 @@
    ac_status=$?
-@@ -33619,8 +33140,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+   (exit $ac_status); }; }; 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
+@@ -34207,8 +34918,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
+@@ -34265,6 +34977,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))
+@@ -34284,8 +34997,8 @@
+   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
+@@ -34308,12 +35021,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
+@@ -34366,18 +35081,19 @@
+ 
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -34414,15 +35130,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
+@@ -34456,9 +35173,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
+@@ -34482,25 +35200,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
+@@ -34513,17 +35225,17 @@
+ done
+ 
+ if test "${ac_cv_header_pty_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for pty.h" >&5
+-echo $ECHO_N "checking for pty.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for pty.h" >&5
++echo $ECHO_N "checking for pty.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_pty_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pty_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
++echo "${ECHO_T}$ac_cv_header_pty_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking pty.h usability" >&5
+-echo $ECHO_N "checking pty.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking pty.h usability" >&5
++echo $ECHO_N "checking pty.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34560,15 +35272,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 pty.h presence" >&5
+-echo $ECHO_N "checking pty.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking pty.h presence" >&5
++echo $ECHO_N "checking pty.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -34602,9 +35315,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
+@@ -34628,31 +35342,24 @@
+ echo "$as_me: WARNING: pty.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: pty.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: pty.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for pty.h" >&5
+-echo $ECHO_N "checking for pty.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for pty.h" >&5
++echo $ECHO_N "checking for pty.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_pty_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_pty_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
+-echo "${ECHO_T}$ac_cv_header_pty_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_pty_h" >&5
++echo "${ECHO_T}$ac_cv_header_pty_h" >&6; }
+ 
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for ptsname" >&5
+-echo $ECHO_N "checking for ptsname... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for ptsname" >&5
++echo $ECHO_N "checking for ptsname... $ECHO_C" >&6; }
+ if test "${ac_cv_func_ptsname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34679,30 +35386,24 @@
+ 
+ #undef ptsname
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char ptsname ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_ptsname) || defined (__stub___ptsname)
++#if defined __stub_ptsname || defined __stub___ptsname
+ choke me
+-#else
+-char (*f) () = ptsname;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != ptsname;
++return ptsname ();
+   ;
+   return 0;
+ }
+@@ -34734,18 +35435,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_ptsname=no
++	ac_cv_func_ptsname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_ptsname" >&5
+-echo "${ECHO_T}$ac_cv_func_ptsname" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_ptsname" >&5
++echo "${ECHO_T}$ac_cv_func_ptsname" >&6; }
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lAlib" >&5
+-echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lAlib" >&5
++echo $ECHO_N "checking for main in -lAlib... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Alib_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34762,7 +35464,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -34794,21 +35496,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Alib_main=no
++	ac_cv_lib_Alib_main=no
+ fi
++
+ 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_Alib_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Alib_main" >&5
++echo "${ECHO_T}$ac_cv_lib_Alib_main" >&6; }
+ if test $ac_cv_lib_Alib_main = yes; then
+   LIBALIB="-lAlib"
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for clnttcp_create" >&5
+-echo $ECHO_N "checking for clnttcp_create... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for clnttcp_create" >&5
++echo $ECHO_N "checking for clnttcp_create... $ECHO_C" >&6; }
+ if test "${ac_cv_func_clnttcp_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34835,30 +35538,24 @@
+ 
+ #undef clnttcp_create
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char clnttcp_create ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_clnttcp_create) || defined (__stub___clnttcp_create)
++#if defined __stub_clnttcp_create || defined __stub___clnttcp_create
+ choke me
+-#else
+-char (*f) () = clnttcp_create;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != clnttcp_create;
++return clnttcp_create ();
+   ;
+   return 0;
+ }
+@@ -34890,19 +35587,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_clnttcp_create=no
++	ac_cv_func_clnttcp_create=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_clnttcp_create" >&5
+-echo "${ECHO_T}$ac_cv_func_clnttcp_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_clnttcp_create" >&5
++echo "${ECHO_T}$ac_cv_func_clnttcp_create" >&6; }
+ if test $ac_cv_func_clnttcp_create = yes; then
+   :
+ else
+ 
+-  echo "$as_me:$LINENO: checking for clnttcp_create in -lnsl" >&5
+-echo $ECHO_N "checking for clnttcp_create in -lnsl... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for clnttcp_create in -lnsl" >&5
++echo $ECHO_N "checking for clnttcp_create in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_clnttcp_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34915,17 +35613,17 @@
+ 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 clnttcp_create ();
+ int
+ main ()
+ {
+-clnttcp_create ();
++return clnttcp_create ();
+   ;
+   return 0;
+ }
+@@ -34957,14 +35655,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_clnttcp_create=no
++	ac_cv_lib_nsl_clnttcp_create=no
+ fi
++
+ 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_nsl_clnttcp_create" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_clnttcp_create" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_clnttcp_create" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_clnttcp_create" >&6; }
+ if test $ac_cv_lib_nsl_clnttcp_create = yes; then
+   LIBRPC="-lnsl"
+ fi
+@@ -34973,8 +35672,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lossaudio" >&5
+-echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lossaudio" >&5
++echo $ECHO_N "checking for main in -lossaudio... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ossaudio_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -34991,7 +35690,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -35023,22 +35722,23 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ossaudio_main=no
++	ac_cv_lib_ossaudio_main=no
+ fi
++
+ 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_ossaudio_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
++echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6; }
+ if test $ac_cv_lib_ossaudio_main = yes; then
+   LIBOSSAUDIO="-lossaudio"
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lcfg" >&5
+-echo $ECHO_N "checking for main in -lcfg... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lcfg" >&5
++echo $ECHO_N "checking for main in -lcfg... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_cfg_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35055,7 +35755,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -35087,20 +35787,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_cfg_main=no
++	ac_cv_lib_cfg_main=no
+ fi
++
+ 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_cfg_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_cfg_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_cfg_main" >&5
++echo "${ECHO_T}$ac_cv_lib_cfg_main" >&6; }
+ if test $ac_cv_lib_cfg_main = yes; then
+   LIBCFG="-lcfg"
+ fi
+ 
+-echo "$as_me:$LINENO: checking for main in -lodm" >&5
+-echo $ECHO_N "checking for main in -lodm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lodm" >&5
++echo $ECHO_N "checking for main in -lodm... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_odm_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35117,7 +35818,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -35149,14 +35850,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_odm_main=no
++	ac_cv_lib_odm_main=no
+ fi
++
+ 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_odm_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_odm_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_odm_main" >&5
++echo "${ECHO_T}$ac_cv_lib_odm_main" >&6; }
+ if test $ac_cv_lib_odm_main = yes; then
+   LIBODM="-lodm"
+ fi
+@@ -35164,8 +35866,8 @@
+ 
+ 
+ kde_have_setupterm=yes
+-echo "$as_me:$LINENO: checking for setupterm in -lcurses" >&5
+-echo $ECHO_N "checking for setupterm in -lcurses... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for setupterm in -lcurses" >&5
++echo $ECHO_N "checking for setupterm in -lcurses... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_curses_setupterm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35178,17 +35880,17 @@
+ 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 setupterm ();
+ int
+ main ()
+ {
+-setupterm ();
++return setupterm ();
+   ;
+   return 0;
+ }
+@@ -35220,19 +35922,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_curses_setupterm=no
++	ac_cv_lib_curses_setupterm=no
+ fi
++
+ 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_curses_setupterm" >&5
+-echo "${ECHO_T}$ac_cv_lib_curses_setupterm" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_setupterm" >&5
++echo "${ECHO_T}$ac_cv_lib_curses_setupterm" >&6; }
+ if test $ac_cv_lib_curses_setupterm = yes; then
+   LIBCURSES=-lcurses
+ else
+-  echo "$as_me:$LINENO: checking for setupterm in -lncurses" >&5
+-echo $ECHO_N "checking for setupterm in -lncurses... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for setupterm in -lncurses" >&5
++echo $ECHO_N "checking for setupterm in -lncurses... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ncurses_setupterm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35245,17 +35948,17 @@
+ 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 setupterm ();
+ int
+ main ()
+ {
+-setupterm ();
++return setupterm ();
+   ;
+   return 0;
+ }
+@@ -35287,19 +35990,20 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_ncurses_setupterm=no
++	ac_cv_lib_ncurses_setupterm=no
+ fi
++
+ 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_ncurses_setupterm" >&5
+-echo "${ECHO_T}$ac_cv_lib_ncurses_setupterm" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_setupterm" >&5
++echo "${ECHO_T}$ac_cv_lib_ncurses_setupterm" >&6; }
+ if test $ac_cv_lib_ncurses_setupterm = yes; then
+   LIBCURSES=-lncurses
+ else
+-  echo "$as_me:$LINENO: checking for setupterm in -lmytinfo" >&5
+-echo $ECHO_N "checking for setupterm in -lmytinfo... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for setupterm in -lmytinfo" >&5
++echo $ECHO_N "checking for setupterm in -lmytinfo... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mytinfo_setupterm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35312,17 +36016,17 @@
+ 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 setupterm ();
+ int
+ main ()
+ {
+-setupterm ();
++return setupterm ();
+   ;
+   return 0;
+ }
+@@ -35354,14 +36058,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_mytinfo_setupterm=no
++	ac_cv_lib_mytinfo_setupterm=no
+ fi
++
+ 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_mytinfo_setupterm" >&5
+-echo "${ECHO_T}$ac_cv_lib_mytinfo_setupterm" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mytinfo_setupterm" >&5
++echo "${ECHO_T}$ac_cv_lib_mytinfo_setupterm" >&6; }
+ if test $ac_cv_lib_mytinfo_setupterm = yes; then
+   LIBCURSES=-lmytinfo
+ else
+@@ -35384,8 +36089,8 @@
+ fi
+ 
+ kde_have_utempter=yes
+-echo "$as_me:$LINENO: checking for addToUtmp in -lutempter" >&5
+-echo $ECHO_N "checking for addToUtmp in -lutempter... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for addToUtmp in -lutempter" >&5
++echo $ECHO_N "checking for addToUtmp in -lutempter... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_utempter_addToUtmp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35398,17 +36103,17 @@
+ 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 addToUtmp ();
+ int
+ main ()
+ {
+-addToUtmp ();
++return addToUtmp ();
+   ;
+   return 0;
+ }
+@@ -35440,14 +36145,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_utempter_addToUtmp=no
++	ac_cv_lib_utempter_addToUtmp=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_utempter_addToUtmp" >&5
+-echo "${ECHO_T}$ac_cv_lib_utempter_addToUtmp" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_utempter_addToUtmp" >&5
++echo "${ECHO_T}$ac_cv_lib_utempter_addToUtmp" >&6; }
+ if test $ac_cv_lib_utempter_addToUtmp = yes; then
+   LIBUTEMPTER=-lutempter
+ else
+@@ -35463,8 +36169,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for res_init" >&5
+-echo $ECHO_N "checking for res_init... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for res_init" >&5
++echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
+ if test "${ac_cv_func_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35491,30 +36197,24 @@
+ 
+ #undef res_init
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char res_init ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_res_init) || defined (__stub___res_init)
++#if defined __stub_res_init || defined __stub___res_init
+ choke me
+-#else
+-char (*f) () = res_init;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != res_init;
++return res_init ();
+   ;
+   return 0;
+ }
+@@ -35546,18 +36246,19 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_res_init=no
++	ac_cv_func_res_init=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
+-echo "${ECHO_T}$ac_cv_func_res_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
++echo "${ECHO_T}$ac_cv_func_res_init" >&6; }
+ if test $ac_cv_func_res_init = yes; then
+   :
+ else
+-  echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5
+-echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for res_init in -lresolv" >&5
++echo $ECHO_N "checking for res_init in -lresolv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_resolv_res_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35570,17 +36271,17 @@
+ 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 res_init ();
+ int
+ main ()
+ {
+-res_init ();
++return res_init ();
+   ;
+   return 0;
+ }
+@@ -35612,14 +36313,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_resolv_res_init=no
++	ac_cv_lib_resolv_res_init=no
+ fi
++
+ 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_resolv_res_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_init" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_res_init" >&6; }
+ if test $ac_cv_lib_resolv_res_init = yes; then
+   LIBRESOLV="-lresolv"
+ fi
+@@ -35628,7 +36330,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'
+@@ -35637,8 +36339,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35688,12 +36390,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_time=no
++	ac_cv_header_time=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+-echo "${ECHO_T}$ac_cv_header_time" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -35716,9 +36419,11 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "$as_me:$LINENO: checking for working long double with more range or precision than double" >&5
+-echo $ECHO_N "checking for working long double with more range or precision than double... $ECHO_C" >&6
+-if test "${ac_cv_c_long_double+set}" = set; then
++
++
++  { echo "$as_me:$LINENO: checking for long double with more range or precision than double" >&5
++echo $ECHO_N "checking for long double with more range or precision than double... $ECHO_C" >&6; }
++if test "${ac_cv_type_long_double_wider+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -35728,13 +36433,27 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <float.h>
+-	  long double foo = 0.0;
++	    long double const a[] =
++	      {
++		 0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON,
++		 LDBL_MIN, LDBL_MAX, LDBL_EPSILON
++	      };
++	    long double
++	    f (long double x)
++	    {
++	       return ((x + (unsigned long int) 10) * (-1 / x) + a[0]
++			+ (x ? f (x) : 'c'));
++	    }
++
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(/* Using '|' rather than '||' catches a GCC 2.95.2 x86 bug.  */
+-	  (DBL_MAX < LDBL_MAX) | (LDBL_EPSILON < DBL_EPSILON)
+-	  | (DBL_MAX_EXP < LDBL_MAX_EXP) | (DBL_MANT_DIG < LDBL_MANT_DIG))];
++static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
++		   + (DBL_MANT_DIG < LDBL_MANT_DIG)
++		   - (LDBL_MAX_EXP < DBL_MAX_EXP)
++		   - (LDBL_MANT_DIG < DBL_MANT_DIG)))
++	    && (int) LDBL_EPSILON == 0
++	  )];
+ test_array [0] = 0
+ 
+   ;
+@@ -35763,27 +36482,37 @@
    ac_status=$?
-@@ -33863,8 +33383,7 @@
-   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -33936,8 +33455,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -33991,8 +33509,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34063,8 +33580,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34118,8 +33634,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34186,8 +33701,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34393,8 +33907,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34539,8 +34052,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34713,8 +34225,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34773,8 +34284,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34869,8 +34379,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -34936,8 +34445,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35002,8 +34510,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35066,8 +34573,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35128,8 +34634,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35199,8 +34704,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35266,8 +34770,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35333,8 +34836,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35419,8 +34921,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35525,8 +35026,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35591,8 +35091,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35667,8 +35166,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -35747,8 +35245,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -35937,8 +35434,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36000,8 +35496,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36041,8 +35536,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36098,8 +35592,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36139,8 +35632,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36204,8 +35696,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36236,10 +35727,8 @@
+   (exit $ac_status); }; }; then
+-  ac_cv_c_long_double=yes
++  ac_cv_type_long_double_wider=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_long_double=no
++	ac_cv_type_long_double_wider=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_long_double" >&5
+-echo "${ECHO_T}$ac_cv_c_long_double" >&6
+-if test $ac_cv_c_long_double = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double_wider" >&5
++echo "${ECHO_T}$ac_cv_type_long_double_wider" >&6; }
++  if test $ac_cv_type_long_double_wider = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_DOUBLE_WIDER 1
++_ACEOF
++
++  fi
++
++    ac_cv_c_long_double=$ac_cv_type_long_double_wider
++    if test $ac_cv_c_long_double = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LONG_DOUBLE 1
+ _ACEOF
+ 
+-fi
++    fi
+ 
+-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35805,8 +36534,8 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
++echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
+ if test $ac_cv_type_uid_t = no; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -35820,8 +36549,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
+-echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5
++echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6; }
+ if test "${ac_cv_type_getgroups+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35835,7 +36564,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ /* Thanks to Mike Rendell for this test.  */
+-#include <sys/types.h>
++$ac_includes_default
+ #define NGID 256
+ #undef MAX
+ #define MAX(x, y) ((x) > (y) ? (x) : (y))
+@@ -35845,7 +36574,7 @@
+ {
+   gid_t gidset[NGID];
+   int i, n;
+-  union { gid_t gval; long lval; }  val;
++  union { gid_t gval; long int lval; }  val;
+ 
+   val.lval = -1;
+   for (i = 0; i < NGID; i++)
+@@ -35853,8 +36582,9 @@
+   n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
+ 		 gidset);
+   /* Exit non-zero if getgroups seems to require an array of ints.  This
+-     happens when gid_t is short but getgroups modifies an array of ints.  */
+-  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
++     happens when gid_t is short int but getgroups modifies an array
++     of ints.  */
++  return n > 0 && gidset[n] != val.gval;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+@@ -35877,8 +36607,10 @@
+ ( exit $ac_status )
+ ac_cv_type_getgroups=int
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ if test $ac_cv_type_getgroups = cross; then
+         cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -35899,8 +36631,8 @@
+ 
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
+-echo "${ECHO_T}$ac_cv_type_getgroups" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
++echo "${ECHO_T}$ac_cv_type_getgroups" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define GETGROUPS_T $ac_cv_type_getgroups
+@@ -35908,8 +36640,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for char" >&5
+-echo $ECHO_N "checking for char... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for char" >&5
++echo $ECHO_N "checking for char... $ECHO_C" >&6; }
+ if test "${ac_cv_type_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -35920,12 +36652,13 @@
+ 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;
+@@ -35958,20 +36691,21 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_char=no
++	ac_cv_type_char=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
+-echo "${ECHO_T}$ac_cv_type_char" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
++echo "${ECHO_T}$ac_cv_type_char" >&6; }
+ 
+-echo "$as_me:$LINENO: checking size of char" >&5
+-echo $ECHO_N "checking size of char... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking size of char" >&5
++echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
+ if test "${ac_cv_sizeof_char+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$ac_cv_type_char" = 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.
+@@ -35984,10 +36718,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36025,10 +36760,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36062,30 +36798,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36123,10 +36861,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36160,23 +36899,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
+@@ -36188,10 +36930,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36225,26 +36968,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
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77
++echo "$as_me: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36252,8 +36989,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char)); }
+-unsigned long ulongval () { return (long) (sizeof (char)); }
++		   typedef char ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -36262,22 +37000,22 @@
+ 
+   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;
+@@ -36301,29 +37039,28 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77
++echo "$as_me: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -36351,8 +35840,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36414,8 +35902,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36455,8 +35942,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36512,8 +35998,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36553,8 +36038,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36618,8 +36102,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36650,10 +36133,8 @@
+   ac_cv_sizeof_char=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_CHAR $ac_cv_sizeof_char
+ _ACEOF
+ 
+ 
+-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
+@@ -36334,12 +37071,13 @@
+ 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;
+@@ -36372,20 +37110,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; }
+ 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.
+@@ -36398,10 +37137,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36439,10 +37179,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36476,30 +37217,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36537,10 +37280,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36574,23 +37318,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
+@@ -36602,10 +37349,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36639,26 +37387,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -36666,8 +37408,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++		   typedef short ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -36676,22 +37419,22 @@
+ 
+   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;
+@@ -36715,29 +37458,28 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -36765,8 +36246,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36828,8 +36308,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36869,8 +36348,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36926,8 +36404,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -36967,8 +36444,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37032,8 +36508,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37064,10 +36539,8 @@
+   ac_cv_sizeof_short=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+ 
+ 
+-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
+@@ -36748,12 +37490,13 @@
+ 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;
+@@ -36786,20 +37529,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; }
+ 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.
+@@ -36812,10 +37556,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36853,10 +37598,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36890,30 +37636,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36951,10 +37699,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -36988,23 +37737,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
+@@ -37016,10 +37768,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -37053,26 +37806,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37080,8 +37827,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++		   typedef int ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -37090,22 +37838,22 @@
+ 
+   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;
+@@ -37129,29 +37877,28 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -37179,8 +36652,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37242,8 +36714,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37283,8 +36754,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37340,8 +36810,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37381,8 +36850,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37446,8 +36914,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37478,10 +36945,8 @@
+   ac_cv_sizeof_int=0
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+ 
+ 
+-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
+@@ -37162,12 +37909,13 @@
+ 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;
+@@ -37200,20 +37948,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; }
+ 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.
+@@ -37226,10 +37975,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -37267,10 +38017,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -37304,30 +38055,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
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -37365,10 +38118,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -37402,23 +38156,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
+@@ -37430,10 +38187,11 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++		   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
+ 
+   ;
+@@ -37467,26 +38225,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
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then
 -  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot run test program while cross compiling
 -See \`config.log' for more details." >&2;}
-+  { { 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; }; }
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -37494,8 +38246,9 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++		   typedef long ac__type_sizeof_;
++static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
++static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -37504,22 +38257,22 @@
+ 
+   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;
+@@ -37543,29 +38296,28 @@
+ 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)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
+-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
++echo "$as_me: error: cannot compute sizeof (long)
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
+ fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
  else
+   ac_cv_sizeof_long=0
+ fi
+ fi
+-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
+ 
+ 
+-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
+@@ -37660,14 +38412,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
+@@ -37677,11 +38430,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; }
+ int
+ main ()
+@@ -37728,7 +38481,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
-@@ -37596,8 +37061,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37639,8 +37103,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37697,8 +37160,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37880,8 +37342,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -37935,9 +37396,6 @@
+@@ -37737,17 +38492,22 @@
+ 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
+@@ -37770,13 +38530,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)
+ 
+@@ -37818,9 +38581,9 @@
+ for ac_func in socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -37846,30 +38609,24 @@
+ 
+ #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;
+ }
+@@ -37901,13 +38658,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
+@@ -37918,15 +38677,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for mkstemps" >&5
+-echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mkstemps" >&5
++echo $ECHO_N "checking for mkstemps... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mkstemps+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -37938,9 +38696,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16634,27 +31904,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37971,8 +37429,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38076,8 +37533,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38156,9 +37612,6 @@
+@@ -37992,8 +38747,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_mkstemps=no
++	kde_cv_func_mkstemps=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -38007,11 +38763,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_func_mkstemps" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mkstemps" >&5
++echo "${ECHO_T}$kde_cv_func_mkstemps" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
+-echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if mkstemps needs custom prototype" >&5
++echo $ECHO_N "checking if mkstemps needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_mkstemps+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38032,8 +38788,7 @@
+ if test "x$kde_cv_proto_mkstemps" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38098,9 +38853,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_mkstemps="mkstemps unavailable"
++	kde_cv_proto_mkstemps="mkstemps unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -38114,8 +38870,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
+-echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_mkstemps" >&5
++echo "${ECHO_T}$kde_cv_proto_mkstemps" >&6; }
+ 
+ if test "x$kde_cv_func_mkstemps" = xyes; then
+ 
+@@ -38139,15 +38895,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for setenv" >&5
+-echo $ECHO_N "checking for setenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for setenv" >&5
++echo $ECHO_N "checking for setenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_setenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -38159,9 +38914,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16664,27 +31993,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38189,8 +37642,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38291,8 +37743,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38371,9 +37822,6 @@
+@@ -38210,8 +38962,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_setenv=no
++	kde_cv_func_setenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -38225,11 +38978,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
+-echo "${ECHO_T}$kde_cv_func_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_setenv" >&5
++echo "${ECHO_T}$kde_cv_func_setenv" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
+-echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if setenv needs custom prototype" >&5
++echo $ECHO_N "checking if setenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_setenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38250,8 +39003,7 @@
+ if test "x$kde_cv_proto_setenv" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38313,9 +39065,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_setenv="setenv unavailable"
++	kde_cv_proto_setenv="setenv unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -38329,8 +39082,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_setenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_setenv" >&5
++echo "${ECHO_T}$kde_cv_proto_setenv" >&6; }
+ 
+ if test "x$kde_cv_func_setenv" = xyes; then
+ 
+@@ -38354,15 +39107,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for unsetenv" >&5
+-echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for unsetenv" >&5
++echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; }
+ if test "${kde_cv_func_unsetenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -38374,9 +39126,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16694,27 +32082,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38404,8 +37852,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38506,8 +37953,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38586,9 +38032,6 @@
+@@ -38425,8 +39174,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_unsetenv=no
++	kde_cv_func_unsetenv=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -38440,11 +39190,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_func_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_func_unsetenv" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
+-echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if unsetenv needs custom prototype" >&5
++echo $ECHO_N "checking if unsetenv needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_unsetenv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38465,8 +39215,7 @@
+ if test "x$kde_cv_proto_unsetenv" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38528,9 +39277,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_unsetenv="unsetenv unavailable"
++	kde_cv_proto_unsetenv="unsetenv unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -38544,8 +39294,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
+-echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_unsetenv" >&5
++echo "${ECHO_T}$kde_cv_proto_unsetenv" >&6; }
+ 
+ if test "x$kde_cv_func_unsetenv" = xyes; then
+ 
+@@ -38569,15 +39319,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for getdomainname" >&5
+-echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for getdomainname" >&5
++echo $ECHO_N "checking for getdomainname... $ECHO_C" >&6; }
+ if test "${kde_cv_func_getdomainname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -38589,9 +39338,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16724,27 +32171,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38624,8 +38067,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38732,8 +38174,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38812,9 +38253,6 @@
+@@ -38645,8 +39391,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_getdomainname=no
++	kde_cv_func_getdomainname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -38660,11 +39407,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5
+-echo "${ECHO_T}$kde_cv_func_getdomainname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_getdomainname" >&5
++echo "${ECHO_T}$kde_cv_func_getdomainname" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5
+-echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if getdomainname needs custom prototype" >&5
++echo $ECHO_N "checking if getdomainname needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_getdomainname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38685,8 +39432,7 @@
+ if test "x$kde_cv_proto_getdomainname" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38754,9 +39500,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_getdomainname="getdomainname unavailable"
++	kde_cv_proto_getdomainname="getdomainname unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -38770,8 +39517,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5
+-echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_getdomainname" >&5
++echo "${ECHO_T}$kde_cv_proto_getdomainname" >&6; }
+ 
+ if test "x$kde_cv_func_getdomainname" = xyes; then
+ 
+@@ -38795,15 +39542,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for gethostname" >&5
+-echo $ECHO_N "checking for gethostname... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for gethostname" >&5
++echo $ECHO_N "checking for gethostname... $ECHO_C" >&6; }
+ if test "${kde_cv_func_gethostname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -38815,9 +39561,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16754,27 +32260,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38849,8 +38287,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -38955,8 +38392,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39035,9 +38471,6 @@
+@@ -38870,8 +39613,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_gethostname=no
++	kde_cv_func_gethostname=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -38885,11 +39629,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
+-echo "${ECHO_T}$kde_cv_func_gethostname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_gethostname" >&5
++echo "${ECHO_T}$kde_cv_func_gethostname" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
+-echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if gethostname needs custom prototype" >&5
++echo $ECHO_N "checking if gethostname needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_gethostname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -38910,8 +39654,7 @@
+ if test "x$kde_cv_proto_gethostname" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -38977,9 +39720,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_gethostname="gethostname unavailable"
++	kde_cv_proto_gethostname="gethostname unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -38993,8 +39737,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
+-echo "${ECHO_T}$kde_cv_proto_gethostname" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_gethostname" >&5
++echo "${ECHO_T}$kde_cv_proto_gethostname" >&6; }
+ 
+ if test "x$kde_cv_func_gethostname" = xyes; then
+ 
+@@ -39018,15 +39762,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for usleep" >&5
+-echo $ECHO_N "checking for usleep... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for usleep" >&5
++echo $ECHO_N "checking for usleep... $ECHO_C" >&6; }
+ if test "${kde_cv_func_usleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -39038,9 +39781,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16784,27 +32349,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39070,8 +38503,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39174,8 +38606,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39254,9 +38685,6 @@
+@@ -39091,8 +39831,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_usleep=no
++	kde_cv_func_usleep=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39106,11 +39847,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
+-echo "${ECHO_T}$kde_cv_func_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_usleep" >&5
++echo "${ECHO_T}$kde_cv_func_usleep" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
+-echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if usleep needs custom prototype" >&5
++echo $ECHO_N "checking if usleep needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_usleep+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39131,8 +39872,7 @@
+ if test "x$kde_cv_proto_usleep" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -39196,9 +39936,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_usleep="usleep unavailable"
++	kde_cv_proto_usleep="usleep unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -39212,8 +39953,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
+-echo "${ECHO_T}$kde_cv_proto_usleep" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_usleep" >&5
++echo "${ECHO_T}$kde_cv_proto_usleep" >&6; }
+ 
+ if test "x$kde_cv_func_usleep" = xyes; then
+ 
+@@ -39237,15 +39978,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for random" >&5
+-echo $ECHO_N "checking for random... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for random" >&5
++echo $ECHO_N "checking for random... $ECHO_C" >&6; }
+ if test "${kde_cv_func_random+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -39257,9 +39997,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16814,27 +32438,86 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39289,8 +38717,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39393,8 +38820,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39472,9 +38898,6 @@
+@@ -39310,8 +40047,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_random=no
++	kde_cv_func_random=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39325,11 +40063,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
+-echo "${ECHO_T}$kde_cv_func_random" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_random" >&5
++echo "${ECHO_T}$kde_cv_func_random" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
+-echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if random needs custom prototype" >&5
++echo $ECHO_N "checking if random needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_random+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39350,8 +40088,7 @@
+ if test "x$kde_cv_proto_random" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -39415,9 +40152,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_random="random unavailable"
++	kde_cv_proto_random="random unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -39431,8 +40169,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
+-echo "${ECHO_T}$kde_cv_proto_random" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_random" >&5
++echo "${ECHO_T}$kde_cv_proto_random" >&6; }
+ 
+ if test "x$kde_cv_func_random" = xyes; then
+ 
+@@ -39455,15 +40193,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for srandom" >&5
+-echo $ECHO_N "checking for srandom... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for srandom" >&5
++echo $ECHO_N "checking for srandom... $ECHO_C" >&6; }
+ if test "${kde_cv_func_srandom+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -39475,9 +40212,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -16844,1373 +32527,8854 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39507,8 +38930,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39611,8 +39033,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -39706,8 +39127,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -39896,8 +39316,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -39967,8 +39386,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -40121,8 +39539,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -40656,8 +40073,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -40948,8 +40364,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41094,8 +40509,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41181,8 +40595,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41244,8 +40657,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41316,8 +40728,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41407,8 +40818,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41482,8 +40892,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41593,8 +41002,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -41763,8 +41171,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -41826,7 +41233,7 @@
+@@ -39528,8 +40262,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_srandom=no
++	kde_cv_func_srandom=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ CXXFLAGS="$save_CXXFLAGS"
+ LIBS="$kde_safe_LIBS"
+@@ -39543,11 +40278,11 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
+-echo "${ECHO_T}$kde_cv_func_srandom" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_srandom" >&5
++echo "${ECHO_T}$kde_cv_func_srandom" >&6; }
+ 
+-echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
+-echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if srandom needs custom prototype" >&5
++echo $ECHO_N "checking if srandom needs custom prototype... $ECHO_C" >&6; }
+ if test "${kde_cv_proto_srandom+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39568,8 +40303,7 @@
+ if test "x$kde_cv_proto_srandom" = xunknown; then
+ 
+ 
+-
+- ac_ext=cc
++ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -39633,9 +40367,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_proto_srandom="srandom unavailable"
++	kde_cv_proto_srandom="srandom unavailable"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$kde_safe_libs
+@@ -39649,8 +40384,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
+-echo "${ECHO_T}$kde_cv_proto_srandom" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_proto_srandom" >&5
++echo "${ECHO_T}$kde_cv_proto_srandom" >&6; }
+ 
+ if test "x$kde_cv_func_srandom" = xyes; then
+ 
+@@ -39674,8 +40409,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for S_ISSOCK" >&5
+-echo $ECHO_N "checking for S_ISSOCK... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for S_ISSOCK" >&5
++echo $ECHO_N "checking for S_ISSOCK... $ECHO_C" >&6; }
+ if test "${ac_cv_have_s_issock+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39727,15 +40462,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_s_issock=no
++	ac_cv_have_s_issock=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $ac_cv_have_s_issock" >&5
+-echo "${ECHO_T}$ac_cv_have_s_issock" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_have_s_issock" >&5
++echo "${ECHO_T}$ac_cv_have_s_issock" >&6; }
+ if test "$ac_cv_have_s_issock" = "yes"; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -39749,8 +40485,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
+-echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for MAXPATHLEN" >&5
++echo $ECHO_N "checking for MAXPATHLEN... $ECHO_C" >&6; }
+ if test "${ac_cv_maxpathlen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39786,16 +40522,16 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
+-echo "${ECHO_T}$ac_cv_maxpathlen" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_maxpathlen" >&5
++echo "${ECHO_T}$ac_cv_maxpathlen" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KDEMAXPATHLEN $ac_cv_maxpathlen
+ _ACEOF
+ 
+ 
+-echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
+-echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5
++echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6; }
+ 
+ case "$host_os" in
+ linux*) utmp_support=yes;
+@@ -39807,8 +40543,8 @@
+ *) utmp_support=no;
+ esac
+ 
+-echo "$as_me:$LINENO: result: $utmp_support" >&5
+-echo "${ECHO_T}$utmp_support" >&6
++{ echo "$as_me:$LINENO: result: $utmp_support" >&5
++echo "${ECHO_T}$utmp_support" >&6; }
+ 
+ if test "$utmp_support" = yes; then
+ 
+@@ -39819,8 +40555,8 @@
+ fi
+ 
+ 
+-    echo "$as_me:$LINENO: checking for utmp file" >&5
+-echo $ECHO_N "checking for utmp file... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for utmp file" >&5
++echo $ECHO_N "checking for utmp file... $ECHO_C" >&6; }
+ 
+     if test "${kde_cv_utmp_file+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -39851,18 +40587,18 @@
+ _ACEOF
+ 
+ 
+-	echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5
+-echo "${ECHO_T}$kde_cv_utmp_file" >&6
++	{ echo "$as_me:$LINENO: result: $kde_cv_utmp_file" >&5
++echo "${ECHO_T}$kde_cv_utmp_file" >&6; }
+     else
+ 
+-	echo "$as_me:$LINENO: result: non found" >&5
+-echo "${ECHO_T}non found" >&6
++	{ echo "$as_me:$LINENO: result: non found" >&5
++echo "${ECHO_T}non found" >&6; }
+     fi
+ 
+ 
+ kde_have_kstat=yes
+-echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
+-echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5
++echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -39875,17 +40611,17 @@
+ 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 kstat_open ();
+ int
+ main ()
+ {
+-kstat_open ();
++return kstat_open ();
+   ;
+   return 0;
+ }
+@@ -39917,14 +40653,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_kstat_kstat_open=no
++	ac_cv_lib_kstat_kstat_open=no
+ fi
++
+ 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_kstat_kstat_open" >&5
+-echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5
++echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; }
+ if test $ac_cv_lib_kstat_kstat_open = yes; then
+   LIBKSTAT=-lkstat
+ else
+@@ -39941,17 +40678,17 @@
+ fi
+ 
+ if test "${ac_cv_header_libdevinfo_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
+-echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
++echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libdevinfo_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
++echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libdevinfo.h usability" >&5
+-echo $ECHO_N "checking libdevinfo.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libdevinfo.h usability" >&5
++echo $ECHO_N "checking libdevinfo.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -39988,15 +40725,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 libdevinfo.h presence" >&5
+-echo $ECHO_N "checking libdevinfo.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libdevinfo.h presence" >&5
++echo $ECHO_N "checking libdevinfo.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40030,9 +40768,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
+@@ -40056,25 +40795,18 @@
+ echo "$as_me: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
+-echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libdevinfo.h" >&5
++echo $ECHO_N "checking for libdevinfo.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libdevinfo_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_libdevinfo_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libdevinfo_h" >&5
++echo "${ECHO_T}$ac_cv_header_libdevinfo_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_libdevinfo_h = yes; then
+@@ -40086,8 +40818,8 @@
+ 
+ if test "$kde_have_libdevinfo_h" = "yes"; then
+    kde_have_libdevinfo_lib=yes
+-   echo "$as_me:$LINENO: checking for di_init in -ldevinfo" >&5
+-echo $ECHO_N "checking for di_init in -ldevinfo... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for di_init in -ldevinfo" >&5
++echo $ECHO_N "checking for di_init in -ldevinfo... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_devinfo_di_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40100,17 +40832,17 @@
+ 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 di_init ();
+ int
+ main ()
+ {
+-di_init ();
++return di_init ();
+   ;
+   return 0;
+ }
+@@ -40142,14 +40874,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_devinfo_di_init=no
++	ac_cv_lib_devinfo_di_init=no
+ fi
++
+ 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_devinfo_di_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_devinfo_di_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_di_init" >&5
++echo "${ECHO_T}$ac_cv_lib_devinfo_di_init" >&6; }
+ if test $ac_cv_lib_devinfo_di_init = yes; then
+   LIBDEVINFO=-ldevinfo
+ else
+@@ -40169,18 +40902,18 @@
+ 
+ 
+ 
+-# Check whether --with-java or --without-java was given.
++# Check whether --with-java was given.
+ if test "${with_java+set}" = set; then
+-  withval="$with_java"
+-    ac_java_dir=$withval
++  withval=$with_java;   ac_java_dir=$withval
+ 
+ else
+   ac_java_dir=""
+ 
+-fi;
++fi
++
+ 
+-echo "$as_me:$LINENO: checking for Java" >&5
+-echo $ECHO_N "checking for Java... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Java" >&5
++echo $ECHO_N "checking for Java... $ECHO_C" >&6; }
+ 
+ if test "x$ac_java_dir" = "xno"; then
+    kde_java_bindir=no
+@@ -40616,8 +41349,7 @@
+ 
+   if test -n "$jni_includes"; then
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -40677,8 +41409,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- kde_jni_works=no
++	 kde_jni_works=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     if test $kde_jni_works = no; then
+@@ -40721,8 +41454,8 @@
+     else
+       JVMLIBS="-L$kde_java_libgcjdir -lgcj"
+     fi
+-    echo "$as_me:$LINENO: result: java JDK in $kde_java_bindir" >&5
+-echo "${ECHO_T}java JDK in $kde_java_bindir" >&6
++    { echo "$as_me:$LINENO: result: java JDK in $kde_java_bindir" >&5
++echo "${ECHO_T}java JDK in $kde_java_bindir" >&6; }
+ 
+   else
+ 
+@@ -40730,8 +41463,8 @@
+ #define PATH_JAVA "$kde_java_bindir/java"
+ _ACEOF
+ 
+-      echo "$as_me:$LINENO: result: java JRE in $kde_java_bindir" >&5
+-echo "${ECHO_T}java JRE in $kde_java_bindir" >&6
++      { echo "$as_me:$LINENO: result: java JRE in $kde_java_bindir" >&5
++echo "${ECHO_T}java JRE in $kde_java_bindir" >&6; }
+   fi
+ elif test -d "/Library/Java/Home"; then
+   kde_java_bindir="/Library/Java/Home/bin"
+@@ -40747,11 +41480,11 @@
+ #define PATH_JAVA "$kde_java_bindir/java"
+ _ACEOF
+ 
+-  echo "$as_me:$LINENO: result: Apple Java Framework" >&5
+-echo "${ECHO_T}Apple Java Framework" >&6
++  { echo "$as_me:$LINENO: result: Apple Java Framework" >&5
++echo "${ECHO_T}Apple Java Framework" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
++  { echo "$as_me:$LINENO: result: none found" >&5
++echo "${ECHO_T}none found" >&6; }
+ fi
+ 
+ 
+@@ -40770,8 +41503,8 @@
  do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MD5SUM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40786,35 +41519,36 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ MD5SUM=$ac_cv_path_MD5SUM
+-
+ if test -n "$MD5SUM"; then
+-  echo "$as_me:$LINENO: result: $MD5SUM" >&5
+-echo "${ECHO_T}$MD5SUM" >&6
++  { echo "$as_me:$LINENO: result: $MD5SUM" >&5
++echo "${ECHO_T}$MD5SUM" >&6; }
+ else
+-  echo "$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 "$MD5SUM" && break
+ done
+ 
+ if test -z "$MD5SUM" ; then
+   # Extract the first word of "md5", so it can be a program name with args.
+ set dummy md5; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MD5SUM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40829,32 +41563,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_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ MD5SUM=$ac_cv_path_MD5SUM
+-
+ if test -n "$MD5SUM"; then
+-  echo "$as_me:$LINENO: result: $MD5SUM" >&5
+-echo "${ECHO_T}$MD5SUM" >&6
++  { echo "$as_me:$LINENO: result: $MD5SUM" >&5
++echo "${ECHO_T}$MD5SUM" >&6; }
+ else
+-  echo "$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 "$MD5SUM" ; then
+     # Extract the first word of "md5", so it can be a program name with args.
+ set dummy md5; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MD5SUM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -40869,27 +41604,28 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_MD5SUM="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   ;;
+ esac
+ fi
+ MD5SUM=$ac_cv_path_MD5SUM
+-
+ if test -n "$MD5SUM"; then
+-  echo "$as_me:$LINENO: result: $MD5SUM" >&5
+-echo "${ECHO_T}$MD5SUM" >&6
++  { echo "$as_me:$LINENO: result: $MD5SUM" >&5
++echo "${ECHO_T}$MD5SUM" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
++
+   fi
+   if test -z "$MD5SUM" ; then
+     { echo "$as_me:$LINENO: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&5
+@@ -40911,8 +41647,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'
+@@ -40922,17 +41657,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
++echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5
++echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -40969,15 +41704,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 X11/extensions/XTest.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5
++echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41011,9 +41747,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
+@@ -41037,30 +41774,23 @@
+ echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5
++echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_XTest_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_XTest_h = yes; then
+-  echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5
+-echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5
++echo $ECHO_N "checking for XTestFakeKeyEvent in -lXtst... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41073,17 +41803,17 @@
+ 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 XTestFakeKeyEvent ();
+ int
+ main ()
+ {
+-XTestFakeKeyEvent ();
++return XTestFakeKeyEvent ();
+   ;
+   return 0;
+ }
+@@ -41115,14 +41845,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xtst_XTestFakeKeyEvent=no
++	ac_cv_lib_Xtst_XTestFakeKeyEvent=no
+ fi
++
+ 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_Xtst_XTestFakeKeyEvent" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5
++echo "${ECHO_T}$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; }
+ if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41150,8 +41881,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'
+@@ -41160,8 +41890,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
+-echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
++echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41202,15 +41932,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_XKBlib_h=no
++	ac_cv_header_X11_XKBlib_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; }
+ if test $ac_cv_header_X11_XKBlib_h = yes; then
+-  echo "$as_me:$LINENO: checking for XkbLockModifiers in -lX11" >&5
+-echo $ECHO_N "checking for XkbLockModifiers in -lX11... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for XkbLockModifiers in -lX11" >&5
++echo $ECHO_N "checking for XkbLockModifiers in -lX11... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_X11_XkbLockModifiers+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41223,17 +41954,17 @@
+ 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 XkbLockModifiers ();
+ int
+ main ()
+ {
+-XkbLockModifiers ();
++return XkbLockModifiers ();
+   ;
+   return 0;
+ }
+@@ -41265,14 +41996,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_X11_XkbLockModifiers=no
++	ac_cv_lib_X11_XkbLockModifiers=no
+ fi
++
+ 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_X11_XkbLockModifiers" >&5
+-echo "${ECHO_T}$ac_cv_lib_X11_XkbLockModifiers" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbLockModifiers" >&5
++echo "${ECHO_T}$ac_cv_lib_X11_XkbLockModifiers" >&6; }
+ if test $ac_cv_lib_X11_XkbLockModifiers = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41281,8 +42013,8 @@
+ 
+ fi
+ 
+-     echo "$as_me:$LINENO: checking for XkbSetPerClientControls in -lX11" >&5
+-echo $ECHO_N "checking for XkbSetPerClientControls in -lX11... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XkbSetPerClientControls in -lX11" >&5
++echo $ECHO_N "checking for XkbSetPerClientControls in -lX11... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_X11_XkbSetPerClientControls+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41295,17 +42027,17 @@
+ 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 XkbSetPerClientControls ();
+ int
+ main ()
+ {
+-XkbSetPerClientControls ();
++return XkbSetPerClientControls ();
+   ;
+   return 0;
+ }
+@@ -41337,14 +42069,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_X11_XkbSetPerClientControls=no
++	ac_cv_lib_X11_XkbSetPerClientControls=no
+ fi
++
+ 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_X11_XkbSetPerClientControls" >&5
+-echo "${ECHO_T}$ac_cv_lib_X11_XkbSetPerClientControls" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbSetPerClientControls" >&5
++echo "${ECHO_T}$ac_cv_lib_X11_XkbSetPerClientControls" >&6; }
+ if test $ac_cv_lib_X11_XkbSetPerClientControls = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -41370,10 +42103,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'
+@@ -41386,9 +42118,9 @@
+ for ac_header in X11/Xcursor/Xcursor.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -41428,12 +42160,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
+@@ -41447,8 +42181,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XcursorSupportsARGB in -lXcursor" >&5
+-echo $ECHO_N "checking for XcursorSupportsARGB in -lXcursor... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XcursorSupportsARGB in -lXcursor" >&5
++echo $ECHO_N "checking for XcursorSupportsARGB in -lXcursor... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xcursor_XcursorSupportsARGB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41461,17 +42195,17 @@
+ 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 XcursorSupportsARGB ();
+ int
+ main ()
+ {
+-XcursorSupportsARGB ();
++return XcursorSupportsARGB ();
+   ;
+   return 0;
+ }
+@@ -41503,14 +42237,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xcursor_XcursorSupportsARGB=no
++	ac_cv_lib_Xcursor_XcursorSupportsARGB=no
+ fi
++
+ 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_Xcursor_XcursorSupportsARGB" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xcursor_XcursorSupportsARGB" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcursor_XcursorSupportsARGB" >&5
++echo "${ECHO_T}$ac_cv_lib_Xcursor_XcursorSupportsARGB" >&6; }
+ if test $ac_cv_lib_Xcursor_XcursorSupportsARGB = yes; then
+   LIB_XCURSOR=-lXcursor
+ 
+@@ -41556,8 +42291,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'
+@@ -41567,17 +42301,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5
++echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41614,15 +42348,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 X11/extensions/Xrender.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5
++echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -41656,9 +42391,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
+@@ -41682,25 +42418,18 @@
+ echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
+@@ -41728,8 +42457,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
+-echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XRenderComposite in -lXrender" >&5
++echo $ECHO_N "checking for XRenderComposite in -lXrender... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -41742,17 +42471,17 @@
+ 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 XRenderComposite ();
+ int
+ main ()
+ {
+-XRenderComposite ();
++return XRenderComposite ();
+   ;
+   return 0;
+ }
+@@ -41784,14 +42513,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xrender_XRenderComposite=no
++	ac_cv_lib_Xrender_XRenderComposite=no
+ fi
++
+ 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_Xrender_XRenderComposite" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderComposite" >&5
++echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderComposite" >&6; }
+ if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
+   LIB_XRENDER=-lXrender
+ 
+@@ -41816,8 +42546,8 @@
+ CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
+ 
+ 
+-echo "$as_me:$LINENO: checking for Qt docs" >&5
+-echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for Qt docs" >&5
++echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; }
+ kde_qtdir=
+ if test "${with_qt_dir+set}" = set; then
+   kde_qtdir="$with_qt_dir"
+@@ -41829,7 +42559,7 @@
+ do
    for j in qsql.html;
    do
--    echo "configure: 41829: $i/$j" >&5
-+    echo "configure: 41236: $i/$j" >&5
+-    echo "configure: 41832: $i/$j" >&5
++    echo "configure: 42562: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -42179,8 +41586,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42273,8 +41679,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -42446,7 +41851,7 @@
+@@ -41838,20 +42568,20 @@
+   done
+ done
+ 
+-echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
+-echo "${ECHO_T}$QTDOCDIR" >&6
++{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5
++echo "${ECHO_T}$QTDOCDIR" >&6; }
+ 
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for dot" >&5
+-echo $ECHO_N "checking for dot... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for dot" >&5
++echo $ECHO_N "checking for dot... $ECHO_C" >&6; }
+    if test -n "$DOT"; then
+         kde_cv_path="$DOT";
+    else
+         kde_cache=`echo dot | sed 'y%./+-%__p_%'`
+ 
+-        if 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
+ 
+@@ -41894,12 +42624,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
+@@ -41911,14 +42641,14 @@
+ fi
+ 
+ 
+-   echo "$as_me:$LINENO: checking for doxygen" >&5
+-echo $ECHO_N "checking for doxygen... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for doxygen" >&5
++echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; }
+    if test -n "$DOXYGEN"; then
+         kde_cv_path="$DOXYGEN";
+    else
+         kde_cache=`echo doxygen | sed 'y%./+-%__p_%'`
+ 
+-        if 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
+ 
+@@ -41961,12 +42691,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
+@@ -42032,14 +42762,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
+ 
+@@ -42082,15 +42812,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
+@@ -42129,11 +42859,11 @@
+ 
+ 
+ 
+-# Check whether --with-composite or --without-composite was given.
++# Check whether --with-composite was given.
+ if test "${with_composite+set}" = set; then
+-  withval="$with_composite"
++  withval=$with_composite;
++fi
+ 
+-fi;
+ 
+ 
+ if test -z "$RUN_KAPPFINDER"; then
+@@ -42146,8 +42876,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'
+@@ -42156,8 +42885,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
++echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42200,12 +42929,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_XKBstr_h=no
++	ac_cv_header_X11_extensions_XKBstr_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
+ if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
+   ACCESS_SUBDIR=access
+ fi
+@@ -42236,8 +42966,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'
+@@ -42247,17 +42976,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
++echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h usability" >&5
+-echo $ECHO_N "checking X11/extensions/XKBstr.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h usability" >&5
++echo $ECHO_N "checking X11/extensions/XKBstr.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42294,15 +43023,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 X11/extensions/XKBstr.h presence" >&5
+-echo $ECHO_N "checking X11/extensions/XKBstr.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/extensions/XKBstr.h presence" >&5
++echo $ECHO_N "checking X11/extensions/XKBstr.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -42336,9 +43066,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
+@@ -42362,25 +43093,18 @@
+ echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
++echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_extensions_XKBstr_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
+@@ -42415,26 +43139,26 @@
+ ssl_libraries=""
+ ssl_includes=""
+ 
+-# Check whether --with-ssl-dir or --without-ssl-dir was given.
++# Check whether --with-ssl-dir was given.
+ if test "${with_ssl_dir+set}" = set; then
+-  withval="$with_ssl_dir"
+-    ac_ssl_includes="$withval"/include
++  withval=$with_ssl_dir;   ac_ssl_includes="$withval"/include
+        ac_ssl_libraries="$withval"/lib$kdelibsuff
+ 
+-fi;
++fi
++
+ 
+ want_ssl=yes
+ 
+-# Check whether --with-ssl or --without-ssl was given.
++# Check whether --with-ssl was given.
+ if test "${with_ssl+set}" = set; then
+-  withval="$with_ssl"
+-  want_ssl=$withval
+-fi;
++  withval=$with_ssl; want_ssl=$withval
++fi
++
+ 
+ if test $want_ssl = yes; then
+ 
+-echo "$as_me:$LINENO: checking for OpenSSL" >&5
+-echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for OpenSSL" >&5
++echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; }
+ 
+ if test "${ac_cv_have_ssl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -42449,7 +43173,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 42449: $i/$j" >&5
-+    echo "configure: 41854: $i/$j" >&5
+-    echo "configure: 42452: $i/$j" >&5
++    echo "configure: 43176: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -42501,8 +41906,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -42751,8 +42155,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -42801,8 +42204,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -42905,8 +42307,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -42972,8 +42373,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -43231,8 +42631,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -43297,8 +42696,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -43448,8 +42846,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -43602,8 +42999,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -43707,8 +43103,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -43827,8 +43222,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -43959,8 +43353,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -44354,8 +43747,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -44525,8 +43917,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -44616,8 +44007,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -44703,8 +44093,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -44934,8 +44323,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -45001,8 +44389,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -45048,8 +44435,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -45129,8 +44515,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -45220,8 +44605,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -45349,8 +44733,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -45447,8 +44830,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -45535,8 +44917,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -45767,8 +45148,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -45977,8 +45357,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -46064,8 +45443,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -46128,8 +45506,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -46213,8 +45590,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -46294,8 +45670,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -46397,8 +45772,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -46461,8 +45835,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -46551,8 +45924,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -46662,8 +46034,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -46760,8 +46131,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -46992,8 +46362,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47224,8 +46593,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47326,8 +46694,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47425,8 +46792,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47494,8 +46860,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47539,8 +46904,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47606,8 +46970,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47651,8 +47014,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47721,8 +47083,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47769,8 +47130,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47880,8 +47240,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -47988,8 +47347,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48091,8 +47449,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48203,8 +47560,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48273,8 +47629,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48350,8 +47705,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48407,8 +47761,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48514,8 +47867,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48624,8 +47976,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48728,8 +48079,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48797,8 +48147,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -48888,8 +48237,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -49065,8 +48413,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -49373,8 +48720,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -49521,8 +48867,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -49677,8 +49022,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -49764,8 +49108,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -49847,8 +49190,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -49934,8 +49276,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -50020,7 +49361,7 @@
+@@ -42523,9 +43247,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_ssl_rsaref="no"
++	ac_ssl_rsaref="no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -42544,26 +43269,26 @@
+ 
+   eval "$ac_cv_have_ssl"
+ 
+-  echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
+-echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
++echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
+-echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
+-echo "${ECHO_T}$ac_ssl_rsaref" >&6
+-
+-  echo "$as_me:$LINENO: checking for easter eggs" >&5
+-echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
++  { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
++echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
++echo "${ECHO_T}$ac_ssl_rsaref" >&6; }
++
++  { echo "$as_me:$LINENO: checking for easter eggs" >&5
++echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: none found" >&5
++echo "${ECHO_T}none found" >&6; }
+ 
+ else
+   have_ssl=no
+ fi
+ 
+ if test "$have_ssl" = yes; then
+-  echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
++echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
+     if test "${ac_cv_ssl_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42636,8 +43361,8 @@
+ 
+ 
+   eval "$ac_cv_ssl_version"
+-  echo "$as_me:$LINENO: result: $ssl_version" >&5
+-echo "${ECHO_T}$ssl_version" >&6
++  { echo "$as_me:$LINENO: result: $ssl_version" >&5
++echo "${ECHO_T}$ssl_version" >&6; }
+ fi
+ 
+ if test "$have_ssl" != yes; then
+@@ -42696,25 +43421,25 @@
+  DPMS_LIB=
+ 
+ 
+-# Check whether --with-dpms or --without-dpms was given.
++# Check whether --with-dpms was given.
+ if test "${with_dpms+set}" = set; then
+-  withval="$with_dpms"
+-  dpms_test=$withval
++  withval=$with_dpms; dpms_test=$withval
+ else
+   dpms_test="yes"
+-fi;
++fi
++
+  if test "x$dpms_test" = xno; then
+    ac_cv_have_dpms=no
+  else
+-   echo "$as_me:$LINENO: checking for DPMS" >&5
+-echo $ECHO_N "checking for DPMS... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for DPMS" >&5
++echo $ECHO_N "checking for DPMS... $ECHO_C" >&6; }
+          if test "${ac_cv_have_dpms+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
+-      echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++      { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+       ac_cv_have_dpms="no"
+     else
+       ac_save_ldflags="$LDFLAGS"
+@@ -42824,12 +43549,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_dpms="no"
++	ac_cv_have_dpms="no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+       LDFLAGS="$ac_save_ldflags"
+@@ -42840,8 +43567,8 @@
+ fi
+ 
+   if test "$ac_cv_have_dpms" = no; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     DPMS_LDFLAGS=""
+     DPMSINC=""
+ 
+@@ -42864,8 +43591,8 @@
+     else
+        DPMSINC="-I$DPMS_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+   fi
+  fi
+@@ -42874,8 +43601,8 @@
+  test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
+ 
+ 
+- echo "$as_me:$LINENO: checking whether DPMSCapable is declared" >&5
+-echo $ECHO_N "checking whether DPMSCapable is declared... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether DPMSCapable is declared" >&5
++echo $ECHO_N "checking whether DPMSCapable is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42893,6 +43620,7 @@
+ {
+ #ifndef DPMSCapable
+   char *p = (char *) DPMSCapable;
++  return !p;
+ #endif
+ 
+   ;
+@@ -42926,12 +43654,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_decl_DPMSCapable=no
++	ac_cv_have_decl_DPMSCapable=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSCapable" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_DPMSCapable" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSCapable" >&5
++echo "${ECHO_T}$ac_cv_have_decl_DPMSCapable" >&6; }
+ if test $ac_cv_have_decl_DPMSCapable = yes; then
+   cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DPMSCAPABLE_PROTO 1
+@@ -42941,8 +43670,8 @@
+ 
+ 
+ 
+- echo "$as_me:$LINENO: checking whether DPMSInfo is declared" >&5
+-echo $ECHO_N "checking whether DPMSInfo is declared... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking whether DPMSInfo is declared" >&5
++echo $ECHO_N "checking whether DPMSInfo is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -42960,6 +43689,7 @@
+ {
+ #ifndef DPMSInfo
+   char *p = (char *) DPMSInfo;
++  return !p;
+ #endif
+ 
+   ;
+@@ -42993,12 +43723,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_have_decl_DPMSInfo=no
++	ac_cv_have_decl_DPMSInfo=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSInfo" >&5
+-echo "${ECHO_T}$ac_cv_have_decl_DPMSInfo" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_DPMSInfo" >&5
++echo "${ECHO_T}$ac_cv_have_decl_DPMSInfo" >&6; }
+ if test $ac_cv_have_decl_DPMSInfo = yes; then
+   cat >>confdefs.h <<\_ACEOF
+ #define HAVE_DPMSINFO_PROTO 1
+@@ -43012,14 +43743,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for fontconfig-config" >&5
+-echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
++echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
+    if test -n "$FONTCONFIG_CONFIG"; then
+         kde_cv_path="$FONTCONFIG_CONFIG";
+    else
+         kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
+ 
+-        if 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
+ 
+@@ -43062,18 +43793,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
+ 
+@@ -43116,23 +43847,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
+@@ -43196,8 +43927,8 @@
+ 
+ case "$host" in
+   *-*-osf*)
+-    echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
+-echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
++echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43210,17 +43941,17 @@
+ 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 vm_statistics ();
+ int
+ main ()
+ {
+-vm_statistics ();
++return vm_statistics ();
+   ;
+   return 0;
+ }
+@@ -43252,14 +43983,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_mach_vm_statistics=no
++	ac_cv_lib_mach_vm_statistics=no
+ fi
++
+ 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_mach_vm_statistics" >&5
+-echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mach_vm_statistics" >&5
++echo "${ECHO_T}$ac_cv_lib_mach_vm_statistics" >&6; }
+ if test $ac_cv_lib_mach_vm_statistics = yes; then
+   LIB_TRU64_MACH="-lmach"
+ fi
+@@ -43270,18 +44002,19 @@
+ for ac_header in linux/raw.h sys/raw.h
  do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -43318,15 +44051,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
+@@ -43360,9 +44094,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
+@@ -43386,25 +44121,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
+@@ -43421,18 +44150,19 @@
+ for ac_header in devinfo.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -43469,15 +44199,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
+@@ -43511,9 +44242,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
+@@ -43537,25 +44269,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
+@@ -43567,8 +44293,8 @@
+ 
+ done
+ 
+-    echo "$as_me:$LINENO: checking for devinfo_foreach_rman in -ldevinfo" >&5
+-echo $ECHO_N "checking for devinfo_foreach_rman in -ldevinfo... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for devinfo_foreach_rman in -ldevinfo" >&5
++echo $ECHO_N "checking for devinfo_foreach_rman in -ldevinfo... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_devinfo_devinfo_foreach_rman+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43581,17 +44307,17 @@
+ 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 devinfo_foreach_rman ();
+ int
+ main ()
+ {
+-devinfo_foreach_rman ();
++return devinfo_foreach_rman ();
+   ;
+   return 0;
+ }
+@@ -43623,14 +44349,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_devinfo_devinfo_foreach_rman=no
++	ac_cv_lib_devinfo_devinfo_foreach_rman=no
+ fi
++
+ 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_devinfo_devinfo_foreach_rman" >&5
+-echo "${ECHO_T}$ac_cv_lib_devinfo_devinfo_foreach_rman" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_devinfo_devinfo_foreach_rman" >&5
++echo "${ECHO_T}$ac_cv_lib_devinfo_devinfo_foreach_rman" >&6; }
+ if test $ac_cv_lib_devinfo_devinfo_foreach_rman = yes; then
+   LIBDEVINFO="-ldevinfo"
+ fi
+@@ -43645,28 +44372,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'
+@@ -43728,8 +44454,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 \
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+@@ -43745,8 +44472,8 @@
+ fi
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     GL_LDFLAGS=""
+     GLINC=""
+     have_gl=no
+@@ -43766,8 +44493,8 @@
+     else
+        GLINC="-I$GL_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
++    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6; }
+     have_gl=yes
+   fi
+  fi
+@@ -43786,15 +44513,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for long long" >&5
+-echo $ECHO_N "checking for long long... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
+ if test "${kde_cv_c_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-   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'
+@@ -43848,8 +44574,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_c_long_long=no
++	kde_cv_c_long_long=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   ac_ext=c
+@@ -43861,8 +44588,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5
+-echo "${ECHO_T}$kde_cv_c_long_long" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_c_long_long" >&5
++echo "${ECHO_T}$kde_cv_c_long_long" >&6; }
+ if test "$kde_cv_c_long_long" = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -43873,13 +44600,13 @@
+ 
+ 
+ 
+-# Check whether --with-libusb or --without-libusb was given.
++# Check whether --with-libusb was given.
+ if test "${with_libusb+set}" = set; then
+-  withval="$with_libusb"
+-
++  withval=$with_libusb;
+ else
+   with_libusb=check
+-fi;
++fi
++
+ 
+ USB_LIBS=
+ USB_CFLAGS=
+@@ -43887,8 +44614,8 @@
+ if test "x$with_libusb" != xno; then
+     # Extract the first word of "libusb-config", so it can be a program name with args.
+ set dummy libusb-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_LIBUSBCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43903,34 +44630,35 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_LIBUSBCONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_LIBUSBCONFIG" && ac_cv_path_LIBUSBCONFIG="no"
+   ;;
+ esac
+ fi
+ LIBUSBCONFIG=$ac_cv_path_LIBUSBCONFIG
+-
+ if test -n "$LIBUSBCONFIG"; then
+-  echo "$as_me:$LINENO: result: $LIBUSBCONFIG" >&5
+-echo "${ECHO_T}$LIBUSBCONFIG" >&6
++  { echo "$as_me:$LINENO: result: $LIBUSBCONFIG" >&5
++echo "${ECHO_T}$LIBUSBCONFIG" >&6; }
+ else
+-  echo "$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 $LIBUSBCONFIG != "no"; then
+         USB_LIBS="$($LIBUSBCONFIG --libs)"
+         USB_CFLAGS="$($LIBUSBCONFIG --cflags)"
+ 
+-        echo "$as_me:$LINENO: checking for main in -lusb" >&5
+-echo $ECHO_N "checking for main in -lusb... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for main in -lusb" >&5
++echo $ECHO_N "checking for main in -lusb... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_usb_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -43948,7 +44676,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -43980,14 +44708,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_usb_main=no
++	ac_cv_lib_usb_main=no
+ fi
++
+ 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_usb_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_usb_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_usb_main" >&5
++echo "${ECHO_T}$ac_cv_lib_usb_main" >&6; }
+ if test $ac_cv_lib_usb_main = yes; then
+   have_libusb=yes
+ 
+@@ -44031,14 +44760,14 @@
+ KFI_FOUND_FREETYPE=0
+ 
+ 
+-   echo "$as_me:$LINENO: checking for freetype-config" >&5
+-echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for freetype-config" >&5
++echo $ECHO_N "checking for freetype-config... $ECHO_C" >&6; }
+    if test -n "$FREETYPE_CONFIG"; then
+         kde_cv_path="$FREETYPE_CONFIG";
+    else
+         kde_cache=`echo freetype-config | sed 'y%./+-%__p_%'`
+ 
+-        if 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
+ 
+@@ -44081,15 +44810,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
+@@ -44125,14 +44854,14 @@
+     KFI_FOUND_FONTCONFIG=0
+     # check for fontconfig...
+ 
+-   echo "$as_me:$LINENO: checking for fontconfig-config" >&5
+-echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for fontconfig-config" >&5
++echo $ECHO_N "checking for fontconfig-config... $ECHO_C" >&6; }
+    if test -n "$FONTCONFIG_CONFIG"; then
+         kde_cv_path="$FONTCONFIG_CONFIG";
+    else
+         kde_cache=`echo fontconfig-config | sed 'y%./+-%__p_%'`
+ 
+-        if 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
+ 
+@@ -44175,18 +44904,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
+ 
+@@ -44229,23 +44958,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
+@@ -44293,8 +45022,8 @@
+ 
+ 
+         # Check OS...
+-        echo "$as_me:$LINENO: checking OS" >&5
+-echo $ECHO_N "checking OS... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking OS" >&5
++echo $ECHO_N "checking OS... $ECHO_C" >&6; }
+         case "$host" in
+             *-*-linux*) UNAME='Linux' ;;
+             *-*-freebsd*) UNAME='FreeBSD' ;;
+@@ -44307,8 +45036,8 @@
+             *-*-darwin*) UNAME='Darwin' ;;
+             *) UNAME='Unknown' ;;
+             esac
+-                echo "$as_me:$LINENO: result: $UNAME" >&5
+-echo "${ECHO_T}$UNAME" >&6
++                { echo "$as_me:$LINENO: result: $UNAME" >&5
++echo "${ECHO_T}$UNAME" >&6; }
+ 
+ 
+         # Check for fontenc...
+@@ -44317,8 +45046,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'
+@@ -44328,17 +45056,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
+-echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
++echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/fonts/fontenc.h usability" >&5
+-echo $ECHO_N "checking X11/fonts/fontenc.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/fonts/fontenc.h usability" >&5
++echo $ECHO_N "checking X11/fonts/fontenc.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44375,15 +45103,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 X11/fonts/fontenc.h presence" >&5
+-echo $ECHO_N "checking X11/fonts/fontenc.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/fonts/fontenc.h presence" >&5
++echo $ECHO_N "checking X11/fonts/fontenc.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44417,9 +45146,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
+@@ -44443,25 +45173,18 @@
+ echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
+-echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/fonts/fontenc.h" >&5
++echo $ECHO_N "checking for X11/fonts/fontenc.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_fonts_fontenc_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_fonts_fontenc_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_fonts_fontenc_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_X11_fonts_fontenc_h = yes; then
+@@ -44484,16 +45207,15 @@
+             ac_LDFLAGS_save="$LDFLAGS"
+             ld_shared_flag=
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
++echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
+ kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+-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'
+@@ -44546,7 +45268,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -44560,13 +45284,13 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  ld_shared_flag="-shared"
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+  :
+ 
+ fi
+@@ -44581,8 +45305,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5
+-echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for FontEncDirectory in -lfontenc" >&5
++echo $ECHO_N "checking for FontEncDirectory in -lfontenc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -44595,17 +45319,17 @@
+ 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 FontEncDirectory ();
+ int
+ main ()
+ {
+-FontEncDirectory ();
++return FontEncDirectory ();
+   ;
+   return 0;
+ }
+@@ -44637,14 +45361,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_fontenc_FontEncDirectory=no
++	ac_cv_lib_fontenc_FontEncDirectory=no
+ fi
++
+ 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_fontenc_FontEncDirectory" >&5
+-echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_fontenc_FontEncDirectory" >&5
++echo "${ECHO_T}$ac_cv_lib_fontenc_FontEncDirectory" >&6; }
+ if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
+   ac_font_enc_lib=1
+ else
+@@ -44677,17 +45402,17 @@
+         CPPFLAGS="$CXXFLAGS"
+ 
+         if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
++echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5
+-echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5
++echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44724,15 +45449,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 X11/Xft/Xft.h presence" >&5
+-echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5
++echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -44766,9 +45492,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
+@@ -44792,25 +45519,18 @@
+ echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
++echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_X11_Xft_Xft_h = yes; then
+@@ -44872,9 +45592,9 @@
+ for ac_func in getifaddrs getnameinfo
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -44900,30 +45620,24 @@
+ 
+ #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;
+ }
+@@ -44955,13 +45669,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
+@@ -44970,8 +45686,8 @@
+ fi
+ done
+ 
+-echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
+-echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5
++echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -45022,7 +45738,7 @@
+   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
+@@ -45069,14 +45785,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_sockaddr_sa_len=no
++	ac_cv_member_struct_sockaddr_sa_len=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6; }
+ if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -45092,10 +45810,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'
+@@ -45108,9 +45825,9 @@
+ for ac_header in X11/extensions/Xrandr.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -45150,12 +45867,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
+@@ -45185,8 +45904,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5
+-echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XRRSetScreenConfigAndRate in -lXrandr" >&5
++echo $ECHO_N "checking for XRRSetScreenConfigAndRate in -lXrandr... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -45199,17 +45918,17 @@
+ 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 XRRSetScreenConfigAndRate ();
+ int
+ main ()
+ {
+-XRRSetScreenConfigAndRate ();
++return XRRSetScreenConfigAndRate ();
+   ;
+   return 0;
+ }
+@@ -45241,14 +45960,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no
++	ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate=no
+ fi
++
+ 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_Xrandr_XRRSetScreenConfigAndRate" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&5
++echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate" >&6; }
+ if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then
+   LIB_XRANDR=-lXrandr
+ 
+@@ -45287,28 +46007,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'
+@@ -45370,8 +46089,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 \
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+@@ -45387,8 +46107,8 @@
+ fi
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     GL_LDFLAGS=""
+     GLINC=""
+ 
+@@ -45409,11 +46129,11 @@
+     else
+        GLINC="-I$GL_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
++    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6; }
+ 
+-    echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
+-echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
++echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -45426,17 +46146,17 @@
+ 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 glXChooseVisual ();
+ int
+ main ()
+ {
+-glXChooseVisual ();
++return glXChooseVisual ();
+   ;
+   return 0;
+ }
+@@ -45468,14 +46188,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_GL_glXChooseVisual=no
++	ac_cv_lib_GL_glXChooseVisual=no
+ fi
++
+ 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_GL_glXChooseVisual" >&5
+-echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
++echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6; }
+ if test $ac_cv_lib_GL_glXChooseVisual = yes; then
+ 
+ 
+@@ -45498,8 +46219,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'
+@@ -45509,17 +46229,17 @@
+ 
+ 
+    if test "${ac_cv_header_kcarddb_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for kcarddb.h" >&5
+-echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for kcarddb.h" >&5
++echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_kcarddb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
++echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking kcarddb.h usability" >&5
+-echo $ECHO_N "checking kcarddb.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking kcarddb.h usability" >&5
++echo $ECHO_N "checking kcarddb.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45556,15 +46276,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 kcarddb.h presence" >&5
+-echo $ECHO_N "checking kcarddb.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking kcarddb.h presence" >&5
++echo $ECHO_N "checking kcarddb.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45598,9 +46319,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
+@@ -45624,25 +46346,18 @@
+ echo "$as_me: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for kcarddb.h" >&5
+-echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for kcarddb.h" >&5
++echo $ECHO_N "checking for kcarddb.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_kcarddb_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_kcarddb_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
+-echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_kcarddb_h" >&5
++echo "${ECHO_T}$ac_cv_header_kcarddb_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_kcarddb_h = yes; then
+@@ -45689,11 +46404,11 @@
+ 
+ 
+ 
+-# Check whether --with-usbids or --without-usbids was given.
++# Check whether --with-usbids was given.
+ if test "${with_usbids+set}" = set; then
+-  withval="$with_usbids"
++  withval=$with_usbids;
++fi
+ 
+-fi;
+ 
+ if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
+ 
+@@ -45716,13 +46431,13 @@
+ 
+ 
+ 
+-# Check whether --with-libraw1394 or --without-libraw1394 was given.
++# Check whether --with-libraw1394 was given.
+ if test "${with_libraw1394+set}" = set; then
+-  withval="$with_libraw1394"
+-
++  withval=$with_libraw1394;
+ else
+   with_libraw1394=check
+-fi;
++fi
++
+ 
+ VIEW1394_SUBDIR=
+ if test "x$with_libraw1394" != xno; then
+@@ -45730,8 +46445,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'
+@@ -45741,17 +46455,17 @@
+ 
+ 
+    if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
+-echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
++echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
++echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5
+-echo $ECHO_N "checking libraw1394/raw1394.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libraw1394/raw1394.h usability" >&5
++echo $ECHO_N "checking libraw1394/raw1394.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45788,15 +46502,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 libraw1394/raw1394.h presence" >&5
+-echo $ECHO_N "checking libraw1394/raw1394.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libraw1394/raw1394.h presence" >&5
++echo $ECHO_N "checking libraw1394/raw1394.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -45830,9 +46545,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
+@@ -45856,25 +46572,18 @@
+ echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
+-echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libraw1394/raw1394.h" >&5
++echo $ECHO_N "checking for libraw1394/raw1394.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_libraw1394_raw1394_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libraw1394_raw1394_h" >&5
++echo "${ECHO_T}$ac_cv_header_libraw1394_raw1394_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_libraw1394_raw1394_h = yes; then
+@@ -45915,9 +46624,9 @@
+ for ac_func in sigset sigaction
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -45943,30 +46652,24 @@
+ 
+ #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;
+ }
+@@ -45998,13 +46701,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
+@@ -46020,19 +46725,18 @@
+ LIB_XSS=
+ 
+ 
+-# Check whether --with-xscreensaver or --without-xscreensaver was given.
++# Check whether --with-xscreensaver was given.
+ if test "${with_xscreensaver+set}" = set; then
+-  withval="$with_xscreensaver"
++  withval=$with_xscreensaver;
++fi
+ 
+-fi;
+ 
+ if test "x$with_xscreensaver" != "xno"; then
+ 
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+ 
+-
+-    ac_ext=cc
++    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -46041,8 +46745,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
+-echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
++echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46085,16 +46789,17 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_scrnsaver_h=no
++	ac_cv_header_X11_extensions_scrnsaver_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6; }
+ if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
+-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46107,17 +46812,17 @@
+ 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 XScreenSaverQueryInfo ();
+ int
+ main ()
+ {
+-XScreenSaverQueryInfo ();
++return XScreenSaverQueryInfo ();
+   ;
+   return 0;
+ }
+@@ -46149,14 +46854,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xext_XScreenSaverQueryInfo=no
++	ac_cv_lib_Xext_XScreenSaverQueryInfo=no
+ fi
++
+ 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_Xext_XScreenSaverQueryInfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
+ if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
+ 
+ 
+@@ -46172,16 +46878,15 @@
+         xss_save_cxxflags="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
++echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
+ kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+-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'
+@@ -46234,11 +46939,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+-  ac_ext=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'
+@@ -46248,19 +46955,19 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+  ld_shared_flag="-shared"
+ else
+- echo "$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 for XScreenSaverQueryInfo in -lXss" >&5
+-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
++echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46273,17 +46980,17 @@
+ 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 XScreenSaverQueryInfo ();
+ int
+ main ()
+ {
+-XScreenSaverQueryInfo ();
++return XScreenSaverQueryInfo ();
+   ;
+   return 0;
+ }
+@@ -46315,14 +47022,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xss_XScreenSaverQueryInfo=no
++	ac_cv_lib_Xss_XScreenSaverQueryInfo=no
+ fi
++
+ 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_Xss_XScreenSaverQueryInfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
++echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
+ if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
+ 
+ 
+@@ -46364,8 +47072,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'
+@@ -46374,8 +47081,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/xf86misc.h" >&5
+-echo $ECHO_N "checking for X11/extensions/xf86misc.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/xf86misc.h" >&5
++echo $ECHO_N "checking for X11/extensions/xf86misc.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_xf86misc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46418,16 +47125,17 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_xf86misc_h=no
++	ac_cv_header_X11_extensions_xf86misc_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86misc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86misc_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86misc_h" >&6; }
+ if test $ac_cv_header_X11_extensions_xf86misc_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5
+-echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for XF86MiscQueryVersion in -lXxf86misc" >&5
++echo $ECHO_N "checking for XF86MiscQueryVersion in -lXxf86misc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46440,17 +47148,17 @@
+ 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 XF86MiscQueryVersion ();
+ int
+ main ()
+ {
+-XF86MiscQueryVersion ();
++return XF86MiscQueryVersion ();
+   ;
+   return 0;
+ }
+@@ -46482,14 +47190,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no
++	ac_cv_lib_Xxf86misc_XF86MiscQueryVersion=no
+ fi
++
+ 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_Xxf86misc_XF86MiscQueryVersion" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&5
++echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscQueryVersion" >&6; }
+ if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
+ 
+ 
+@@ -46516,8 +47225,8 @@
+ 
+ 
+ if test -n "$LIB_XF86MISC"; then
+-    echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5
+-echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5
++echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46530,17 +47239,17 @@
+ 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 XF86MiscSetGrabKeysState ();
+ int
+ main ()
+ {
+-XF86MiscSetGrabKeysState ();
++return XF86MiscSetGrabKeysState ();
+   ;
+   return 0;
+ }
+@@ -46572,14 +47281,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no
++	ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no
+ fi
++
+ 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_Xxf86misc_XF86MiscSetGrabKeysState" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5
++echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6; }
+ if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
+ 
+ 
+@@ -46600,28 +47310,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'
+@@ -46683,8 +47392,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 \
+       conftest$ac_exeext conftest.$ac_ext
+     ac_ext=c
+@@ -46700,8 +47410,8 @@
+ fi
+ 
+   if test "$ac_cv_have_gl" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     GL_LDFLAGS=""
+     GLINC=""
+ 
+@@ -46722,11 +47432,11 @@
+     else
+        GLINC="-I$GL_INCLUDE"
+     fi
+-    echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
+-echo "${ECHO_T}$ac_cv_have_gl" >&6
++    { echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
++echo "${ECHO_T}$ac_cv_have_gl" >&6; }
+ 
+-    echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
+-echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
++echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -46739,17 +47449,17 @@
+ 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 glXChooseVisual ();
+ int
+ main ()
+ {
+-glXChooseVisual ();
++return glXChooseVisual ();
+   ;
+   return 0;
+ }
+@@ -46781,14 +47491,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_GL_glXChooseVisual=no
++	ac_cv_lib_GL_glXChooseVisual=no
+ fi
++
+ 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_GL_glXChooseVisual" >&5
+-echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
++echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6; }
+ if test $ac_cv_lib_GL_glXChooseVisual = yes; then
+ 
+ 
+@@ -46806,8 +47517,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking \"struct ucred\"" >&5
+-echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking \"struct ucred\"" >&5
++echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -46829,15 +47540,15 @@
+ #define HAVE_STRUCT_UCRED 1
+ _ACEOF
+ 
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-    echo "$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 nogroup" >&5
+-echo $ECHO_N "checking nogroup... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking nogroup" >&5
++echo $ECHO_N "checking nogroup... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then
+   nogroup=65534
+ else
+@@ -46918,21 +47629,25 @@
+ ( exit $ac_status )
+ nogroup=65534
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-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
+-echo "$as_me:$LINENO: result: $nogroup" >&5
+-echo "${ECHO_T}$nogroup" >&6
++
++
++{ echo "$as_me:$LINENO: result: $nogroup" >&5
++echo "${ECHO_T}$nogroup" >&6; }
+ 
+ 
+ for ac_func in getpeereid
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-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
+@@ -46958,30 +47673,24 @@
+ 
+ #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;
+ }
+@@ -47013,13 +47722,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
+@@ -47030,14 +47741,14 @@
+ 
+ 
+ 
+-   echo "$as_me:$LINENO: checking for xmkmf" >&5
+-echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for xmkmf" >&5
++echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6; }
+    if test -n "$XMKMF"; then
+         kde_cv_path="$XMKMF";
+    else
+         kde_cache=`echo xmkmf | sed 'y%./+-%__p_%'`
+ 
+-        if 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
+ 
+@@ -47080,21 +47791,21 @@
+    fi
+ 
+    if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
++      { echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6; }
+       { { echo "$as_me:$LINENO: error: xmkmf/imake not found. Please make sure it's in PATH!" >&5
+ echo "$as_me: error: xmkmf/imake not found. Please make sure it's in PATH!" >&2;}
+    { (exit 1); exit 1; }; }
+    else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
++      { echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6; }
+       XMKMF=$kde_cv_path
+ 
+    fi
+ 
+ 
+-echo "$as_me:$LINENO: checking X paths" >&5
+-echo $ECHO_N "checking X paths... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X paths" >&5
++echo $ECHO_N "checking X paths... $ECHO_C" >&6; }
+ imkv=8
+ test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
+ if test "${kde_cv_defines_imake+set}" = set; then
+@@ -47114,8 +47825,8 @@
+ 	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
+ 	kde_cv_defines_imake_version=$imkv
+     else
+-        echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++        { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+ 	{ { echo "$as_me:$LINENO: error: $XMKMF (imake) failed.
+ Make sure you have all necessary X development packages installed.
+ On some systems a missing /lib/cpp symlink is at fault." >&5
+@@ -47127,8 +47838,8 @@
+     cd ..
+     rm -fr conftestdir
+   else
+-    echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++    { echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6; }
+     { { echo "$as_me:$LINENO: error: cannot create temporary directory" >&5
+ echo "$as_me: error: cannot create temporary directory" >&2;}
+    { (exit 1); exit 1; }; }
+@@ -47136,8 +47847,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: done" >&5
+-echo "${ECHO_T}done" >&6
++{ echo "$as_me:$LINENO: result: done" >&5
++echo "${ECHO_T}done" >&6; }
+ eval "$kde_cv_defines_imake"
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47162,9 +47873,9 @@
+ for ac_func in getttyent
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -47190,30 +47901,24 @@
+ 
+ #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;
+ }
+@@ -47245,13 +47950,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
+@@ -47264,8 +47971,8 @@
+ 	linux*) ac_cv_func_getutxent=no;;
+ 	darwin*) ac_cv_func_getutxent=no;;
+ 	kfreebsd*-gnu) ac_cv_func_getutxent=no;;
+-	*) echo "$as_me:$LINENO: checking for getutxent" >&5
+-echo $ECHO_N "checking for getutxent... $ECHO_C" >&6
++	*) { echo "$as_me:$LINENO: checking for getutxent" >&5
++echo $ECHO_N "checking for getutxent... $ECHO_C" >&6; }
+ if test "${ac_cv_func_getutxent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47292,30 +47999,24 @@
+ 
+ #undef getutxent
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char getutxent ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getutxent) || defined (__stub___getutxent)
++#if defined __stub_getutxent || defined __stub___getutxent
+ choke me
+-#else
+-char (*f) () = getutxent;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != getutxent;
++return getutxent ();
+   ;
+   return 0;
+ }
+@@ -47347,13 +48048,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_getutxent=no
++	ac_cv_func_getutxent=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getutxent" >&5
+-echo "${ECHO_T}$ac_cv_func_getutxent" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getutxent" >&5
++echo "${ECHO_T}$ac_cv_func_getutxent" >&6; }
+ ;;
+ esac
+ if test $ac_cv_func_getutxent = yes; then
+@@ -47363,8 +48065,8 @@
+ _ACEOF
+ 
+ else
+-	echo "$as_me:$LINENO: checking for getutent" >&5
+-echo $ECHO_N "checking for getutent... $ECHO_C" >&6
++	{ echo "$as_me:$LINENO: checking for getutent" >&5
++echo $ECHO_N "checking for getutent... $ECHO_C" >&6; }
+ if test "${ac_cv_func_getutent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47391,30 +48093,24 @@
+ 
+ #undef getutent
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char getutent ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getutent) || defined (__stub___getutent)
++#if defined __stub_getutent || defined __stub___getutent
+ choke me
+-#else
+-char (*f) () = getutent;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != getutent;
++return getutent ();
+   ;
+   return 0;
+ }
+@@ -47446,13 +48142,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_getutent=no
++	ac_cv_func_getutent=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getutent" >&5
+-echo "${ECHO_T}$ac_cv_func_getutent" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_getutent" >&5
++echo "${ECHO_T}$ac_cv_func_getutent" >&6; }
+ if test $ac_cv_func_getutent = yes; then
+   :
+ else
+@@ -47465,8 +48162,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5
+-echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for struct utmp.ut_user" >&5
++echo $ECHO_N "checking for struct utmp.ut_user... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47515,7 +48212,7 @@
+   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
+@@ -47560,14 +48257,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_utmp_ut_user=no
++	ac_cv_member_struct_utmp_ut_user=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_utmp_ut_user" >&5
++echo "${ECHO_T}$ac_cv_member_struct_utmp_ut_user" >&6; }
+ if test $ac_cv_member_struct_utmp_ut_user = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47577,8 +48276,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for struct passwd.pw_expire" >&5
+-echo $ECHO_N "checking for struct passwd.pw_expire... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for struct passwd.pw_expire" >&5
++echo $ECHO_N "checking for struct passwd.pw_expire... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_passwd_pw_expire+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47627,7 +48326,7 @@
+   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
+@@ -47672,14 +48371,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_passwd_pw_expire=no
++	ac_cv_member_struct_passwd_pw_expire=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_expire" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_expire" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_passwd_pw_expire" >&5
++echo "${ECHO_T}$ac_cv_member_struct_passwd_pw_expire" >&6; }
+ if test $ac_cv_member_struct_passwd_pw_expire = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47689,8 +48390,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5
+-echo $ECHO_N "checking for struct sockaddr_in.sin_len... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for struct sockaddr_in.sin_len" >&5
++echo $ECHO_N "checking for struct sockaddr_in.sin_len... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -47742,7 +48443,7 @@
+   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
+@@ -47790,14 +48491,16 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_member_struct_sockaddr_in_sin_len=no
++	ac_cv_member_struct_sockaddr_in_sin_len=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5
+-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in_sin_len" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in_sin_len" >&5
++echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in_sin_len" >&6; }
+ if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -47818,9 +48521,9 @@
+ for ac_func in setlogin setusercontext getusershell login_getclass auth_timeok
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -47846,30 +48549,24 @@
+ 
+ #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;
+ }
+@@ -47901,13 +48598,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
+@@ -47926,9 +48625,9 @@
+ for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -47954,30 +48653,24 @@
+ 
+ #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;
+ }
+@@ -48009,13 +48702,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
+@@ -48029,9 +48724,9 @@
+ for ac_func in arc4random
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -48057,30 +48752,24 @@
+ 
+ #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;
+ }
+@@ -48112,13 +48801,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
+@@ -48141,8 +48832,8 @@
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking for vsyslog" >&5
+-echo $ECHO_N "checking for vsyslog... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for vsyslog" >&5
++echo $ECHO_N "checking for vsyslog... $ECHO_C" >&6; }
+ if test "${ac_cv_func_vsyslog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48169,30 +48860,24 @@
+ 
+ #undef vsyslog
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char vsyslog ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_vsyslog) || defined (__stub___vsyslog)
++#if defined __stub_vsyslog || defined __stub___vsyslog
+ choke me
+-#else
+-char (*f) () = vsyslog;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != vsyslog;
++return vsyslog ();
+   ;
+   return 0;
+ }
+@@ -48224,13 +48909,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_vsyslog=no
++	ac_cv_func_vsyslog=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_vsyslog" >&5
+-echo "${ECHO_T}$ac_cv_func_vsyslog" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_vsyslog" >&5
++echo "${ECHO_T}$ac_cv_func_vsyslog" >&6; }
+ if test $ac_cv_func_vsyslog = yes; then
+ 
+ 
+@@ -48244,8 +48930,8 @@
+ kdm_no_Xau=false
+ kdm_no_Xdmcp=false
+ 
+-echo "$as_me:$LINENO: checking for main in -lXau" >&5
+-echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -lXau" >&5
++echo $ECHO_N "checking for main in -lXau... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xau_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48262,7 +48948,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -48294,14 +48980,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xau_main=no
++	ac_cv_lib_Xau_main=no
+ fi
++
+ 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_Xau_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_main" >&5
++echo "${ECHO_T}$ac_cv_lib_Xau_main" >&6; }
+ if test $ac_cv_lib_Xau_main = yes; then
+   :
+ else
+@@ -48313,16 +49000,16 @@
+ 
+ 
+ 
+-# Check whether --with-xdmcp or --without-xdmcp was given.
++# Check whether --with-xdmcp was given.
+ if test "${with_xdmcp+set}" = set; then
+-  withval="$with_xdmcp"
+-
++  withval=$with_xdmcp;
+ else
+   with_xdmcp=yes
+-fi;
++fi
++
+ if test "x$with_xdmcp" = xyes; then
+-  echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5
+-echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for main in -lXdmcp" >&5
++echo $ECHO_N "checking for main in -lXdmcp... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48339,7 +49026,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -48371,14 +49058,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xdmcp_main=no
++	ac_cv_lib_Xdmcp_main=no
+ fi
++
+ 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_Xdmcp_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp_main" >&5
++echo "${ECHO_T}$ac_cv_lib_Xdmcp_main" >&6; }
+ if test $ac_cv_lib_Xdmcp_main = yes; then
+   LIBXDMCP="-lXdmcp"
+ fi
+@@ -48386,8 +49074,8 @@
+   if test -n "$LIBXDMCP"; then
+     cppflags_safe=$CPPFLAGS
+     CPPFLAGS="$CPPFLAGS $X_INCLUDES"
+-    echo "$as_me:$LINENO: checking for X11/Xdmcp.h" >&5
+-echo $ECHO_N "checking for X11/Xdmcp.h... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for X11/Xdmcp.h" >&5
++echo $ECHO_N "checking for X11/Xdmcp.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48428,12 +49116,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_Xdmcp_h=no
++	ac_cv_header_X11_Xdmcp_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xdmcp_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xdmcp_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xdmcp_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_Xdmcp_h" >&6; }
+ if test $ac_cv_header_X11_Xdmcp_h = yes; then
+   HAVE_X11_XDMCP_H=1
+ fi
+@@ -48452,8 +49141,8 @@
+ 
+   ac_save_libs=$LIBS
+   LIBS="$LIBS $LIBXDMCP"
+-  echo "$as_me:$LINENO: checking for XdmcpWrap" >&5
+-echo $ECHO_N "checking for XdmcpWrap... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for XdmcpWrap" >&5
++echo $ECHO_N "checking for XdmcpWrap... $ECHO_C" >&6; }
+ if test "${ac_cv_func_XdmcpWrap+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48480,30 +49169,24 @@
+ 
+ #undef XdmcpWrap
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char XdmcpWrap ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_XdmcpWrap) || defined (__stub___XdmcpWrap)
++#if defined __stub_XdmcpWrap || defined __stub___XdmcpWrap
+ choke me
+-#else
+-char (*f) () = XdmcpWrap;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != XdmcpWrap;
++return XdmcpWrap ();
+   ;
+   return 0;
+ }
+@@ -48535,13 +49218,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_XdmcpWrap=no
++	ac_cv_func_XdmcpWrap=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_XdmcpWrap" >&5
+-echo "${ECHO_T}$ac_cv_func_XdmcpWrap" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_XdmcpWrap" >&5
++echo "${ECHO_T}$ac_cv_func_XdmcpWrap" >&6; }
+ if test $ac_cv_func_XdmcpWrap = yes; then
+ 
+ 
+@@ -48560,25 +49244,25 @@
+ KRB4_LIBS=
+ KRB4_RPATH=
+ 
+-echo "$as_me:$LINENO: checking whether to use Kerberos v4" >&5
+-echo $ECHO_N "checking whether to use Kerberos v4... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to use Kerberos v4" >&5
++echo $ECHO_N "checking whether to use Kerberos v4... $ECHO_C" >&6; }
+ 
+-# Check whether --with-krb4 or --without-krb4 was given.
++# Check whether --with-krb4 was given.
+ if test "${with_krb4+set}" = set; then
+-  withval="$with_krb4"
+-   test "x$with_krb4" = xyes && with_krb4=/usr/kerberos
++  withval=$with_krb4;  test "x$with_krb4" = xyes && with_krb4=/usr/kerberos
+ else
+    with_krb4=no
+ 
+-fi;
++fi
++
+ case "$with_krb4" in
+ no)
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+   ;;
+ *)
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define KRB4 1
+@@ -48589,8 +49273,8 @@
+   if test "$USE_RPATH" = "yes" ; then
+     KRB4_RPATH="-R $with_krb4/lib"
+   fi
+-  echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
+-echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5
++echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48603,17 +49287,17 @@
+ 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 dn_expand ();
+ int
+ main ()
+ {
+-dn_expand ();
++return dn_expand ();
+   ;
+   return 0;
+ }
+@@ -48645,14 +49329,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_resolv_dn_expand=no
++	ac_cv_lib_resolv_dn_expand=no
+ fi
++
+ 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_resolv_dn_expand" >&5
+-echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
++echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; }
+ if test $ac_cv_lib_resolv_dn_expand = yes; then
+   KRB4_LIBS="$KRB4_LIBS -lresolv"
+ fi
+@@ -48660,29 +49345,29 @@
+   ;;
+ esac
+ 
+-echo "$as_me:$LINENO: checking whether to use AFS" >&5
+-echo $ECHO_N "checking whether to use AFS... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to use AFS" >&5
++echo $ECHO_N "checking whether to use AFS... $ECHO_C" >&6; }
+ 
+-# Check whether --with-afs or --without-afs was given.
++# Check whether --with-afs was given.
+ if test "${with_afs+set}" = set; then
+-  withval="$with_afs"
+-
++  withval=$with_afs;
+ else
+    with_afs=no
+-fi;
++fi
++
+ if test "$with_afs" = no; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ else
+   if test "$with_krb4" = no; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+     { echo "$as_me:$LINENO: WARNING: \"AFS requires Kerberos v4 support.\"" >&5
+ echo "$as_me: WARNING: \"AFS requires Kerberos v4 support.\"" >&2;}
+     with_afs=no
+   else
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define AFS 1
+@@ -48699,8 +49384,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -ls" >&5
+-echo $ECHO_N "checking for main in -ls... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for main in -ls" >&5
++echo $ECHO_N "checking for main in -ls... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_s_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48717,7 +49402,7 @@
+ int
+ main ()
+ {
+-main ();
++return main ();
+   ;
+   return 0;
+ }
+@@ -48749,21 +49434,22 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_s_main=no
++	ac_cv_lib_s_main=no
+ fi
++
+ 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_s_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_s_main" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_s_main" >&5
++echo "${ECHO_T}$ac_cv_lib_s_main" >&6; }
+ if test $ac_cv_lib_s_main = yes; then
+   LIB_LIBS="-ls"
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5
+-echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for sched_yield in -lposix4" >&5
++echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -48776,17 +49462,17 @@
+ 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 sched_yield ();
+ int
+ main ()
+ {
+-sched_yield ();
++return sched_yield ();
+   ;
+   return 0;
+ }
+@@ -48818,14 +49504,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_posix4_sched_yield=no
++	ac_cv_lib_posix4_sched_yield=no
+ fi
++
+ 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_posix4_sched_yield" >&5
+-echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix4_sched_yield" >&5
++echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6; }
+ if test $ac_cv_lib_posix4_sched_yield = yes; then
+   LIBPOSIX4=-lposix4
+ fi
+@@ -48836,22 +49523,22 @@
+ KRB5_LIBS=
+ KRB5_RPATH=
+ 
+-echo "$as_me:$LINENO: checking whether to use Kerberos5 for Xauth cookies in kdm" >&5
+-echo $ECHO_N "checking whether to use Kerberos5 for Xauth cookies in kdm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to use Kerberos5 for Xauth cookies in kdm" >&5
++echo $ECHO_N "checking whether to use Kerberos5 for Xauth cookies in kdm... $ECHO_C" >&6; }
+ 
+-# Check whether --with-krb5auth or --without-krb5auth was given.
++# Check whether --with-krb5auth was given.
+ if test "${with_krb5auth+set}" = set; then
+-  withval="$with_krb5auth"
+-
++  withval=$with_krb5auth;
+ else
+    with_krb5auth=no
+-fi;
++fi
++
+ if test "x$with_krb5auth" = xno; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   if test "x$with_krb5auth" != xyes; then
+     KRB5_INCS="-I$with_krb5auth/include"
+     KRB5_LIBS="-L$with_krb5auth/lib"
+@@ -48862,17 +49549,17 @@
+   KRB5_LIBS="$KRB5_LIBS -lkrb5"   keepcflags=$CFLAGS
+   CFLAGS="$KRB5_INCS $CFLAGS"
+   if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
+-echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
++echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
+-echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
++echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking krb5/krb5.h usability" >&5
+-echo $ECHO_N "checking krb5/krb5.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking krb5/krb5.h usability" >&5
++echo $ECHO_N "checking krb5/krb5.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -48909,15 +49596,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 krb5/krb5.h presence" >&5
+-echo $ECHO_N "checking krb5/krb5.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking krb5/krb5.h presence" >&5
++echo $ECHO_N "checking krb5/krb5.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -48951,9 +49639,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
+@@ -48977,25 +49666,18 @@
+ echo "$as_me: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
+-echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for krb5/krb5.h" >&5
++echo $ECHO_N "checking for krb5/krb5.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_krb5_krb5_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
+-echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_krb5_krb5_h" >&5
++echo "${ECHO_T}$ac_cv_header_krb5_krb5_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_krb5_krb5_h = yes; then
+@@ -49022,34 +49704,34 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether to use Sun's secure RPC for Xauth cookies in kdm" >&5
+-echo $ECHO_N "checking whether to use Sun's secure RPC for Xauth cookies in kdm... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to use Sun's secure RPC for Xauth cookies in kdm" >&5
++echo $ECHO_N "checking whether to use Sun's secure RPC for Xauth cookies in kdm... $ECHO_C" >&6; }
+ 
+-# Check whether --with-rpcauth or --without-rpcauth was given.
++# Check whether --with-rpcauth was given.
+ if test "${with_rpcauth+set}" = set; then
+-  withval="$with_rpcauth"
+-
++  withval=$with_rpcauth;
+ else
+    with_rpcauth=no
+-fi;
++fi
++
+ if test "x$with_rpcauth" = xno; then
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
+-echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
++echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
++echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking rpc/rpc.h usability" >&5
+-echo $ECHO_N "checking rpc/rpc.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking rpc/rpc.h usability" >&5
++echo $ECHO_N "checking rpc/rpc.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -49086,15 +49768,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 rpc/rpc.h presence" >&5
+-echo $ECHO_N "checking rpc/rpc.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking rpc/rpc.h presence" >&5
++echo $ECHO_N "checking rpc/rpc.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -49128,9 +49811,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
+@@ -49154,25 +49838,18 @@
+ echo "$as_me: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
+-echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for rpc/rpc.h" >&5
++echo $ECHO_N "checking for rpc/rpc.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_rpc_rpc_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_rpc_rpc_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
+-echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_rpc_rpc_h" >&5
++echo "${ECHO_T}$ac_cv_header_rpc_rpc_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_rpc_rpc_h = yes; then
+@@ -49219,13 +49896,13 @@
+ fi
+ 
+ 
+-# Check whether --with-kdm-xconsole or --without-kdm-xconsole was given.
++# Check whether --with-kdm-xconsole was given.
+ if test "${with_kdm_xconsole+set}" = set; then
+-  withval="$with_kdm_xconsole"
+-
++  withval=$with_kdm_xconsole;
+ else
+   with_kdm_xconsole=no
+-fi;
++fi
++
+ if test "x$with_kdm_xconsole" = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -49237,16 +49914,15 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking if covariant return works" >&5
+-echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if covariant return works" >&5
++echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6; }
+ if test "${kde_cv_covariant_return+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     kde_cv_covariant_return=no
+ 
+-
+-     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'
+@@ -49304,8 +49980,10 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -49317,30 +49995,29 @@
+ 
+ 
+ if test "$kde_cv_covariant_return" = "no"; then
+-    echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define COVARIANT_RETURN_BROKEN 1
+ _ACEOF
+ 
+ else
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for working using" >&5
+-echo $ECHO_N "checking for working using... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for working using" >&5
++echo $ECHO_N "checking for working using... $ECHO_C" >&6; }
+ if test "${kde_cv_working_using+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+     kde_cv_working_using=no
+ 
+-
+-     ac_ext=cc
++     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+@@ -49394,7 +50071,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
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -49407,16 +50086,16 @@
+ 
+ 
+ if test "$kde_cv_working_using" = "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_WORKING_USING 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
+ 
+ 
+@@ -49425,8 +50104,8 @@
+ artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
+ # Extract the first word of "artsc-config", so it can be a program name with args.
+ set dummy artsc-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49441,29 +50120,30 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ARTSCCONFIG="$as_dir/$ac_word$ac_exec_ext"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_ARTSCCONFIG" && ac_cv_path_ARTSCCONFIG="no"
+   ;;
+ esac
+ fi
+ ARTSCCONFIG=$ac_cv_path_ARTSCCONFIG
+-
+ if test -n "$ARTSCCONFIG"; then
+-  echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
+-echo "${ECHO_T}$ARTSCCONFIG" >&6
++  { echo "$as_me:$LINENO: result: $ARTSCCONFIG" >&5
++echo "${ECHO_T}$ARTSCCONFIG" >&6; }
+ else
+-  echo "$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 "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
+ 	LIB_ARTS="-lartskde"
+ 	ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
+@@ -49494,18 +50174,19 @@
+ for ac_header in sys/loadavg.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -49542,15 +50223,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
+@@ -49584,9 +50266,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
+@@ -49610,25 +50293,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
+@@ -49646,8 +50323,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'
+@@ -49656,8 +50332,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xcomposite.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xcomposite.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/Xcomposite.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xcomposite.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xcomposite_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49698,12 +50374,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xcomposite_h=no
++	ac_cv_header_X11_extensions_Xcomposite_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xcomposite_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xcomposite_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xcomposite_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xcomposite_h" >&6; }
+ if test $ac_cv_header_X11_extensions_Xcomposite_h = yes; then
+   xcomposite_h=yes
+ else
+@@ -49729,8 +50406,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
+-echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XCompositeQueryExtension in -lXcomposite" >&5
++echo $ECHO_N "checking for XCompositeQueryExtension in -lXcomposite... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49743,17 +50420,17 @@
+ 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 XCompositeQueryExtension ();
+ int
+ main ()
+ {
+-XCompositeQueryExtension ();
++return XCompositeQueryExtension ();
+   ;
+   return 0;
+ }
+@@ -49785,14 +50462,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
++	ac_cv_lib_Xcomposite_XCompositeQueryExtension=no
+ fi
++
+ 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_Xcomposite_XCompositeQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&5
++echo "${ECHO_T}$ac_cv_lib_Xcomposite_XCompositeQueryExtension" >&6; }
+ if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
+   LIB_XCOMPOSITE=-lXcomposite
+ 
+@@ -49816,8 +50494,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'
+@@ -49826,8 +50503,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49868,12 +50545,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xfixes_h=no
++	ac_cv_header_X11_extensions_Xfixes_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6; }
+ if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
+   xfixes_h=yes
+ else
+@@ -49899,8 +50577,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
+-echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
++echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -49913,17 +50591,17 @@
+ 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 XFixesQueryExtension ();
+ int
+ main ()
+ {
+-XFixesQueryExtension ();
++return XFixesQueryExtension ();
+   ;
+   return 0;
+ }
+@@ -49955,14 +50633,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xfixes_XFixesQueryExtension=no
++	ac_cv_lib_Xfixes_XFixesQueryExtension=no
+ fi
++
+ 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_Xfixes_XFixesQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5
++echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6; }
+ if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
+   LIB_XFIXES=-lXfixes
+ 
+@@ -49989,26 +50668,26 @@
+ ssl_libraries=""
+ ssl_includes=""
+ 
+-# Check whether --with-ssl-dir or --without-ssl-dir was given.
++# Check whether --with-ssl-dir was given.
+ if test "${with_ssl_dir+set}" = set; then
+-  withval="$with_ssl_dir"
+-    ac_ssl_includes="$withval"/include
++  withval=$with_ssl_dir;   ac_ssl_includes="$withval"/include
+        ac_ssl_libraries="$withval"/lib$kdelibsuff
+ 
+-fi;
++fi
++
+ 
+ want_ssl=yes
+ 
+-# Check whether --with-ssl or --without-ssl was given.
++# Check whether --with-ssl was given.
+ if test "${with_ssl+set}" = set; then
+-  withval="$with_ssl"
+-  want_ssl=$withval
+-fi;
++  withval=$with_ssl; want_ssl=$withval
++fi
++
+ 
+ if test $want_ssl = yes; then
+ 
+-echo "$as_me:$LINENO: checking for OpenSSL" >&5
+-echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for OpenSSL" >&5
++echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6; }
+ 
+ if test "${ac_cv_have_ssl+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -50023,7 +50702,7 @@
+ do
    for j in openssl/ssl.h;
    do
--    echo "configure: 50023: $i/$j" >&5
-+    echo "configure: 49364: $i/$j" >&5
+-    echo "configure: 50026: $i/$j" >&5
++    echo "configure: 50705: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -50075,8 +49416,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -50313,8 +49653,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -50486,8 +49825,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -50658,8 +49996,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -50751,8 +50088,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -50841,8 +50177,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -50931,8 +50266,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -51026,8 +50360,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -51131,8 +50464,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -51321,8 +50653,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -51380,7 +50711,7 @@
+@@ -50097,9 +50776,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_ssl_rsaref="no"
++	ac_ssl_rsaref="no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+@@ -50118,26 +50798,26 @@
+ 
+   eval "$ac_cv_have_ssl"
+ 
+-  echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
+-echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6
++  { echo "$as_me:$LINENO: result: libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&5
++echo "${ECHO_T}libraries $ac_ssl_libraries, headers $ac_ssl_includes" >&6; }
+ 
+-  echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
+-echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
+-echo "${ECHO_T}$ac_ssl_rsaref" >&6
+-
+-  echo "$as_me:$LINENO: checking for easter eggs" >&5
+-echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6
+-  echo "$as_me:$LINENO: result: none found" >&5
+-echo "${ECHO_T}none found" >&6
++  { echo "$as_me:$LINENO: checking whether OpenSSL uses rsaref" >&5
++echo $ECHO_N "checking whether OpenSSL uses rsaref... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: $ac_ssl_rsaref" >&5
++echo "${ECHO_T}$ac_ssl_rsaref" >&6; }
++
++  { echo "$as_me:$LINENO: checking for easter eggs" >&5
++echo $ECHO_N "checking for easter eggs... $ECHO_C" >&6; }
++  { echo "$as_me:$LINENO: result: none found" >&5
++echo "${ECHO_T}none found" >&6; }
+ 
+ else
+   have_ssl=no
+ fi
+ 
+ if test "$have_ssl" = yes; then
+-  echo "$as_me:$LINENO: checking for OpenSSL version" >&5
+-echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for OpenSSL version" >&5
++echo $ECHO_N "checking for OpenSSL version... $ECHO_C" >&6; }
+     if test "${ac_cv_ssl_version+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -50210,8 +50890,8 @@
+ 
+ 
+   eval "$ac_cv_ssl_version"
+-  echo "$as_me:$LINENO: result: $ssl_version" >&5
+-echo "${ECHO_T}$ssl_version" >&6
++  { echo "$as_me:$LINENO: result: $ssl_version" >&5
++echo "${ECHO_T}$ssl_version" >&6; }
+ fi
+ 
+ if test "$have_ssl" != yes; then
+@@ -50270,10 +50950,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'
+@@ -50286,18 +50965,19 @@
+ for ac_header in sasl.h
  do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -50334,15 +51014,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
+@@ -50376,9 +51057,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
+@@ -50402,25 +51084,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
+@@ -50443,10 +51119,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'
+@@ -50459,18 +51134,19 @@
+ for ac_header in sasl/sasl.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -50507,15 +51183,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
+@@ -50549,9 +51226,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
+@@ -50575,25 +51253,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
+@@ -50623,8 +51295,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
+-echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
++echo $ECHO_N "checking for sasl_client_init in -lsasl2... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -50637,17 +51309,17 @@
+ 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 sasl_client_init ();
+ int
+ main ()
+ {
+-sasl_client_init ();
++return sasl_client_init ();
+   ;
+   return 0;
+ }
+@@ -50679,14 +51351,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_sasl2_sasl_client_init=no
++	ac_cv_lib_sasl2_sasl_client_init=no
+ fi
++
+ 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_sasl2_sasl_client_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_client_init" >&5
++echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_client_init" >&6; }
+ if test $ac_cv_lib_sasl2_sasl_client_init = yes; then
+   SASL2_LIBS="-lsasl2"
+ fi
+@@ -50706,15 +51379,14 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5
+-echo $ECHO_N "checking for bzDecompress in libbz2... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for bzDecompress in libbz2" >&5
++echo $ECHO_N "checking for bzDecompress in libbz2... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_bzip2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+- 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'
+@@ -50772,8 +51444,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_bzip2=no"
++	eval "ac_cv_lib_bzip2=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS="$kde_save_LIBS"
+@@ -50786,8 +51459,8 @@
+ 
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5
+-echo "${ECHO_T}$ac_cv_lib_bzip2" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2" >&5
++echo "${ECHO_T}$ac_cv_lib_bzip2" >&6; }
+ 
+ if test ! "$ac_cv_lib_bzip2" = no; then
+   BZIP2DIR=bzip2
+@@ -50800,16 +51473,15 @@
+    cxx_shared_flag=
+    ld_shared_flag=
+ 
+-echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
+-echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5
++echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; }
+ kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'`
+-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'
+@@ -50862,7 +51534,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -50876,30 +51550,29 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+ 	ld_shared_flag="-shared"
+ 
+ else
+- echo "$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 -fPIC" >&5
+-echo $ECHO_N "checking whether $CXX supports -fPIC... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether $CXX supports -fPIC" >&5
++echo $ECHO_N "checking whether $CXX supports -fPIC... $ECHO_C" >&6; }
+ kde_cache=`echo fPIC | sed 'y% .=/+-,%____p__%'`
+-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'
+@@ -50952,7 +51625,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   CXXFLAGS="$save_CXXFLAGS"
+@@ -50966,29 +51641,28 @@
+ fi
+ 
+ if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+  :
+ 
+         cxx_shared_flag="-fPIC"
+ 
+ else
+- echo "$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 for BZ2_bzDecompress in (shared) libbz2" >&5
+-echo $ECHO_N "checking for BZ2_bzDecompress in (shared) libbz2... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for BZ2_bzDecompress in (shared) libbz2" >&5
++echo $ECHO_N "checking for BZ2_bzDecompress in (shared) libbz2... $ECHO_C" >&6; }
+    if test "${ac_cv_lib_bzip2_prefix+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-    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'
+@@ -51047,8 +51721,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_lib_bzip2_prefix=no"
++	eval "ac_cv_lib_bzip2_prefix=no"
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+    LIBS="$kde_save_LIBS"
+@@ -51062,8 +51737,8 @@
+ 
+ fi
+ 
+-   echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5
+-echo "${ECHO_T}$ac_cv_lib_bzip2_prefix" >&6
++   { echo "$as_me:$LINENO: result: $ac_cv_lib_bzip2_prefix" >&5
++echo "${ECHO_T}$ac_cv_lib_bzip2_prefix" >&6; }
+ 
+    if test ! "$ac_cv_lib_bzip2_prefix" = no; then
+      BZIP2DIR=bzip2
+@@ -51104,18 +51779,19 @@
+ for ac_header in termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -51152,15 +51828,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
+@@ -51194,9 +51871,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
+@@ -51220,25 +51898,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
+@@ -51259,9 +51931,9 @@
+ for ac_func in getpt openpty isastream
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -51287,30 +51959,24 @@
+ 
+ #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;
+ }
+@@ -51342,13 +52008,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
+@@ -51359,13 +52027,12 @@
+ 
+ LIBS="$kde_save_LIBS"
+ 
+-echo "$as_me:$LINENO: checking for LDAP support" >&5
+-echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for LDAP support" >&5
++echo $ECHO_N "checking for LDAP support... $ECHO_C" >&6; }
+ 
+-# Check whether --with-ldap or --without-ldap was given.
++# Check whether --with-ldap was given.
+ if test "${with_ldap+set}" = set; then
+-  withval="$with_ldap"
+-   case "$withval" in
++  withval=$with_ldap;  case "$withval" in
+   yes)
+     with_ldap=CHECK
+     ;;
+@@ -51373,7 +52040,8 @@
+ else
+    with_ldap=CHECK
+ 
+-fi;
++fi
++
+ if test "x$with_ldap" = "xCHECK" ; then
+   with_ldap=NOTFOUND
+   search_incs="$kde_includes /usr/include /usr/local/include"
+@@ -51383,7 +52051,7 @@
+ do
    for j in ldap.h;
    do
--    echo "configure: 51383: $i/$j" >&5
-+    echo "configure: 50714: $i/$j" >&5
+-    echo "configure: 51386: $i/$j" >&5
++    echo "configure: 52054: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_incdir=$i
-@@ -51402,7 +50733,7 @@
+@@ -51405,7 +52073,7 @@
  do
    for j in libldap.$ext;
    do
--    echo "configure: 51405: $i/$j" >&5
-+    echo "configure: 50736: $i/$j" >&5
+-    echo "configure: 51408: $i/$j" >&5
++    echo "configure: 52076: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_libdir=$i
-@@ -51498,8 +50829,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -51592,8 +50922,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -51688,8 +51017,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -51836,7 +51164,7 @@
+@@ -51428,8 +52096,8 @@
+ fi
+ 
+ case "$with_ldap" in
+-no) echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6 ;;
++no) { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; } ;;
+ framework)
+   LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
+ 
+@@ -51438,18 +52106,18 @@
+ _ACEOF
+ 
+   LDAP_SUBDIR="ldap"
+-  echo "$as_me:$LINENO: result: Apple framework" >&5
+-echo "${ECHO_T}Apple framework" >&6
++  { echo "$as_me:$LINENO: result: Apple framework" >&5
++echo "${ECHO_T}Apple framework" >&6; }
+   ;;
+ FOUND)
+-  echo "$as_me:$LINENO: result: incs=$ldap_incdir libs=$ldap_libdir" >&5
+-echo "${ECHO_T}incs=$ldap_incdir libs=$ldap_libdir" >&6
++  { echo "$as_me:$LINENO: result: incs=$ldap_incdir libs=$ldap_libdir" >&5
++echo "${ECHO_T}incs=$ldap_incdir libs=$ldap_libdir" >&6; }
+   ;;
+-NOTFOUND) echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6 ;;
++NOTFOUND) { echo "$as_me:$LINENO: result: searched but not found" >&5
++echo "${ECHO_T}searched but not found" >&6; } ;;
+ *)
+-  echo "$as_me:$LINENO: result: $with_ldap" >&5
+-echo "${ECHO_T}$with_ldap" >&6
++  { echo "$as_me:$LINENO: result: $with_ldap" >&5
++echo "${ECHO_T}$with_ldap" >&6; }
+   ;;
+ esac
+ 
+@@ -51463,8 +52131,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for ber_alloc in -llber" >&5
+-echo $ECHO_N "checking for ber_alloc in -llber... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for ber_alloc in -llber" >&5
++echo $ECHO_N "checking for ber_alloc in -llber... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_lber_ber_alloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -51477,17 +52145,17 @@
+ 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 ber_alloc ();
+ int
+ main ()
+ {
+-ber_alloc ();
++return ber_alloc ();
+   ;
+   return 0;
+ }
+@@ -51519,14 +52187,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_lber_ber_alloc=no
++	ac_cv_lib_lber_ber_alloc=no
+ fi
++
+ 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_lber_ber_alloc" >&5
+-echo "${ECHO_T}$ac_cv_lib_lber_ber_alloc" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_alloc" >&5
++echo "${ECHO_T}$ac_cv_lib_lber_ber_alloc" >&6; }
+ if test $ac_cv_lib_lber_ber_alloc = yes; then
+   LIB_LBER=-llber
+ fi
+@@ -51536,8 +52205,8 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking whether LDAP support can be compiled" >&5
+-echo $ECHO_N "checking whether LDAP support can be compiled... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether LDAP support can be compiled" >&5
++echo $ECHO_N "checking whether LDAP support can be compiled... $ECHO_C" >&6; }
+ 
+   if test "x$with_ldap" != "xFOUND" ; then
+     LDAP_ROOT="$with_ldap"
+@@ -51557,7 +52226,6 @@
+   LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
+   CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS"
+ 
+-
+   ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -51613,9 +52281,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-with_ldap=no
++	with_ldap=no
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+   ac_ext=c
+@@ -51631,8 +52300,8 @@
+     LDAP_LIBS=
+     LDAP_RPATH=
+     LDAP_SUBDIR=
+-    echo "$as_me:$LINENO: result: no (but first try gave $msg)" >&5
+-echo "${ECHO_T}no (but first try gave $msg)" >&6
++    { echo "$as_me:$LINENO: result: no (but first try gave $msg)" >&5
++echo "${ECHO_T}no (but first try gave $msg)" >&6; }
+   else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -51640,8 +52309,8 @@
+ _ACEOF
+ 
+     LDAP_SUBDIR="ldap"
+-    echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+   fi
+ 
+ 
+@@ -51662,17 +52331,17 @@
+ ########### Check for linux/cdrom.h
+ 
+ if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
+-echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
++echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
+-echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
++echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5
+-echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking linux/cdrom.h usability" >&5
++echo $ECHO_N "checking linux/cdrom.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51709,15 +52378,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 linux/cdrom.h presence" >&5
+-echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking linux/cdrom.h presence" >&5
++echo $ECHO_N "checking linux/cdrom.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -51751,9 +52421,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
+@@ -51777,25 +52448,18 @@
+ echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
+-echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for linux/cdrom.h" >&5
++echo $ECHO_N "checking for linux/cdrom.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_linux_cdrom_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
+-echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_cdrom_h" >&5
++echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_linux_cdrom_h = yes; then
+@@ -51814,19 +52478,19 @@
+ 
+ 
+ 
+-# Check whether --with-hal or --without-hal was given.
++# Check whether --with-hal was given.
+ if test "${with_hal+set}" = set; then
+-  withval="$with_hal"
+-  hal_test="$withval"
++  withval=$with_hal; hal_test="$withval"
+ else
+   hal_test="yes"
+-fi;
++fi
++
+ 
+ if test "x$hal_test" = "xyes" ; then
+ 
+ ########### Check for the HAL
+-  echo "$as_me:$LINENO: checking for the HAL" >&5
+-echo $ECHO_N "checking for the HAL... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for the HAL" >&5
++echo $ECHO_N "checking for the HAL... $ECHO_C" >&6; }
+ 
+   hal_inc=NOTFOUND
+   hal_lib=NOTFOUND
+@@ -51839,7 +52503,7 @@
  do
    for j in libhal.h libhal-storage.h;
    do
--    echo "configure: 51839: $i/$j" >&5
-+    echo "configure: 51167: $i/$j" >&5
+-    echo "configure: 51842: $i/$j" >&5
++    echo "configure: 52506: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_incdir=$i
-@@ -51871,7 +51199,7 @@
+@@ -51874,7 +52538,7 @@
  do
    for j in libhal.so libhal-storage.so;
    do
--    echo "configure: 51874: $i/$j" >&5
-+    echo "configure: 51202: $i/$j" >&5
+-    echo "configure: 51877: $i/$j" >&5
++    echo "configure: 52541: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_libdir=$i
-@@ -52024,7 +51352,7 @@
+@@ -51903,8 +52567,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
+@@ -51919,28 +52583,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
+@@ -51951,25 +52616,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for hal" >&5
+-echo $ECHO_N "checking for hal... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for hal" >&5
++echo $ECHO_N "checking for hal... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists "hal" ; 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 HAL_CFLAGS" >&5
+-echo $ECHO_N "checking HAL_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking HAL_CFLAGS" >&5
++echo $ECHO_N "checking HAL_CFLAGS... $ECHO_C" >&6; }
+             HAL_CFLAGS=`$PKG_CONFIG --cflags "hal"`
+-            echo "$as_me:$LINENO: result: $HAL_CFLAGS" >&5
+-echo "${ECHO_T}$HAL_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $HAL_CFLAGS" >&5
++echo "${ECHO_T}$HAL_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking HAL_LIBS" >&5
+-echo $ECHO_N "checking HAL_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking HAL_LIBS" >&5
++echo $ECHO_N "checking HAL_LIBS... $ECHO_C" >&6; }
+             HAL_LIBS=`$PKG_CONFIG --libs "hal"`
+-            echo "$as_me:$LINENO: result: $HAL_LIBS" >&5
+-echo "${ECHO_T}$HAL_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $HAL_LIBS" >&5
++echo "${ECHO_T}$HAL_LIBS" >&6; }
+         else
+             HAL_CFLAGS=""
+             HAL_LIBS=""
+@@ -51990,20 +52655,20 @@
+   if test $succeeded = yes; then
+       HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND;
+   else
+-     echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH" >&5
+-echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH" >&6
++     { echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH" >&5
++echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH" >&6; }
+   fi
+ 
+ 
+   fi
+ 
+   if test "$hal_inc" = FOUND && test "$hal_lib" = FOUND ; then
+-      echo "$as_me:$LINENO: result: headers $HAL_INCS  libraries $HAL_LIBS" >&5
+-echo "${ECHO_T}headers $HAL_INCS  libraries $HAL_LIBS" >&6
++      { echo "$as_me:$LINENO: result: headers $HAL_INCS  libraries $HAL_LIBS" >&5
++echo "${ECHO_T}headers $HAL_INCS  libraries $HAL_LIBS" >&6; }
+       hal=FOUND
+   else
+-      echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6
++      { echo "$as_me:$LINENO: result: searched but not found" >&5
++echo "${ECHO_T}searched but not found" >&6; }
+   fi
+ 
+ 
+@@ -52013,8 +52678,8 @@
+ 
+ ########### Check for DBus
+ 
+-  echo "$as_me:$LINENO: checking for DBus" >&5
+-echo $ECHO_N "checking for DBus... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for DBus" >&5
++echo $ECHO_N "checking for DBus... $ECHO_C" >&6; }
+ 
+   dbus_inc=NOTFOUND
+   dbus_lib=NOTFOUND
+@@ -52027,7 +52692,7 @@
  do
    for j in dbus/dbus.h;
    do
--    echo "configure: 52027: $i/$j" >&5
-+    echo "configure: 51355: $i/$j" >&5
+-    echo "configure: 52030: $i/$j" >&5
++    echo "configure: 52695: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir=$i
-@@ -52041,7 +51369,7 @@
+@@ -52044,7 +52709,7 @@
  do
    for j in dbus/dbus-arch-deps.h;
    do
--    echo "configure: 52044: $i/$j" >&5
-+    echo "configure: 51372: $i/$j" >&5
+-    echo "configure: 52047: $i/$j" >&5
++    echo "configure: 52712: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir_arch_deps=$i
-@@ -52063,7 +51391,7 @@
+@@ -52066,7 +52731,7 @@
  do
    for j in libdbus-1.so;
    do
--    echo "configure: 52066: $i/$j" >&5
-+    echo "configure: 51394: $i/$j" >&5
+-    echo "configure: 52069: $i/$j" >&5
++    echo "configure: 52734: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_libdir=$i
-@@ -52213,7 +51541,7 @@
+@@ -52095,8 +52760,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
+@@ -52111,28 +52776,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
+@@ -52143,25 +52809,25 @@
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for \"dbus-1\"" >&5
+-echo $ECHO_N "checking for \"dbus-1\"... $ECHO_C" >&6
++        { echo "$as_me:$LINENO: checking for \"dbus-1\"" >&5
++echo $ECHO_N "checking for \"dbus-1\"... $ECHO_C" >&6; }
+ 
+         if $PKG_CONFIG --exists ""dbus-1"" ; then
+-            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 DBUS_CFLAGS" >&5
+-echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
++echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; }
+             DBUS_CFLAGS=`$PKG_CONFIG --cflags ""dbus-1""`
+-            echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
+-echo "${ECHO_T}$DBUS_CFLAGS" >&6
++            { echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
++echo "${ECHO_T}$DBUS_CFLAGS" >&6; }
+ 
+-            echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
+-echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6
++            { echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
++echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; }
+             DBUS_LIBS=`$PKG_CONFIG --libs ""dbus-1""`
+-            echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
+-echo "${ECHO_T}$DBUS_LIBS" >&6
++            { echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
++echo "${ECHO_T}$DBUS_LIBS" >&6; }
+         else
+             DBUS_CFLAGS=""
+             DBUS_LIBS=""
+@@ -52182,19 +52848,19 @@
+   if test $succeeded = yes; then
+       DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND;
+   else
+-     echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH " >&5
+-echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH " >&6
++     { echo "$as_me:$LINENO: result: Nothing found on PKG_CONFIG_PATH " >&5
++echo "${ECHO_T}Nothing found on PKG_CONFIG_PATH " >&6; }
+   fi
+ 
+ 
+   fi
+   if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
+-    echo "$as_me:$LINENO: result: headers $DBUS_INCS libraries $DBUS_LIBS" >&5
+-echo "${ECHO_T}headers $DBUS_INCS libraries $DBUS_LIBS" >&6
++    { echo "$as_me:$LINENO: result: headers $DBUS_INCS libraries $DBUS_LIBS" >&5
++echo "${ECHO_T}headers $DBUS_INCS libraries $DBUS_LIBS" >&6; }
+     dbus=FOUND
+   else
+-    echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6
++    { echo "$as_me:$LINENO: result: searched but not found" >&5
++echo "${ECHO_T}searched but not found" >&6; }
+   fi
+ 
+ 
+@@ -52202,8 +52868,8 @@
+ 
+ ########### Check for DBus-Qt bindings
+ 
+-  echo "$as_me:$LINENO: checking for DBus-Qt bindings" >&5
+-echo $ECHO_N "checking for DBus-Qt bindings... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for DBus-Qt bindings" >&5
++echo $ECHO_N "checking for DBus-Qt bindings... $ECHO_C" >&6; }
+ 
+   dbusqt_inc=NOTFOUND
+   dbusqt_lib=NOTFOUND
+@@ -52216,7 +52882,7 @@
  do
    for j in dbus/connection.h;
    do
--    echo "configure: 52216: $i/$j" >&5
-+    echo "configure: 51544: $i/$j" >&5
+-    echo "configure: 52219: $i/$j" >&5
++    echo "configure: 52885: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52240,7 +51568,7 @@
+@@ -52243,7 +52909,7 @@
  do
    for j in libdbus-qt-1.so;
    do
--    echo "configure: 52243: $i/$j" >&5
-+    echo "configure: 51571: $i/$j" >&5
+-    echo "configure: 52246: $i/$j" >&5
++    echo "configure: 52912: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52264,7 +51592,7 @@
+@@ -52267,7 +52933,7 @@
  do
    for j in dbus/connection.h;
    do
--    echo "configure: 52267: $i/$j" >&5
-+    echo "configure: 51595: $i/$j" >&5
+-    echo "configure: 52270: $i/$j" >&5
++    echo "configure: 52936: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52290,7 +51618,7 @@
+@@ -52293,7 +52959,7 @@
  do
    for j in libdbus-qt-1.so;
    do
--    echo "configure: 52293: $i/$j" >&5
-+    echo "configure: 51621: $i/$j" >&5
+-    echo "configure: 52296: $i/$j" >&5
++    echo "configure: 52962: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52416,8 +51744,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+@@ -52312,12 +52978,12 @@
+ 
+ 
+   if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
+-    echo "$as_me:$LINENO: result: headers $dbusqt_incdir libraries $dbusqt_libdir" >&5
+-echo "${ECHO_T}headers $dbusqt_incdir libraries $dbusqt_libdir" >&6
++    { echo "$as_me:$LINENO: result: headers $dbusqt_incdir libraries $dbusqt_libdir" >&5
++echo "${ECHO_T}headers $dbusqt_incdir libraries $dbusqt_libdir" >&6; }
+     dbusqt=FOUND
+   else
+-    echo "$as_me:$LINENO: result: searched but not found" >&5
+-echo "${ECHO_T}searched but not found" >&6
++    { echo "$as_me:$LINENO: result: searched but not found" >&5
++echo "${ECHO_T}searched but not found" >&6; }
+   fi
+ 
+ 
+@@ -52326,8 +52992,8 @@
+ 
+ ########### Check if media HAL backend sould be compiled
+ 
+-echo "$as_me:$LINENO: checking if the HAL backend for media:/ should be compiled" >&5
+-echo $ECHO_N "checking if the HAL backend for media:/ should be compiled... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if the HAL backend for media:/ should be compiled" >&5
++echo $ECHO_N "checking if the HAL backend for media:/ should be compiled... $ECHO_C" >&6; }
+ 
+ HALBACKEND=no
+ if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
+@@ -52338,11 +53004,11 @@
+ 
+   HALBACKEND=yes
+ 
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+@@ -52369,15 +53035,15 @@
+ 
+ 
+ 
+-# 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
+@@ -52385,8 +53051,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
+@@ -52410,7 +53076,7 @@
+   return 0;
+ }
+ _ACEOF
+-     	 rm -f conftest.$ac_objext
++	 rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -52446,8 +51773,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
+@@ -52437,10 +53103,12 @@
+   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
++	 CC="$CC -n32"
++	 rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>conftest.er1
    ac_status=$?
-@@ -52517,8 +51843,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -52570,8 +51895,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -52642,8 +51966,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -52695,8 +52018,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -52798,8 +52120,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -52968,8 +52289,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -53075,8 +52395,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -53151,8 +52470,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -53340,8 +52658,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -53450,8 +52767,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -53537,8 +52853,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -53639,8 +52954,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -53726,8 +53040,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -53795,8 +53108,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -53851,8 +53163,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -54476,8 +53787,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -54564,8 +53874,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -54628,8 +53937,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -54841,8 +54149,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -55012,8 +54319,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -55123,8 +54429,7 @@
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='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=$?
-@@ -55223,8 +54528,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -55310,8 +54614,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -55397,8 +54700,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -55499,8 +54801,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -55656,8 +54957,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -55737,8 +55037,7 @@
-   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'
-+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -57335,6 +56634,13 @@
+@@ -52467,7 +53135,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
++
+ rm -f conftest.err conftest.$ac_objext
+ 	 break
+        done
+@@ -52475,14 +53145,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
+@@ -52538,7 +53208,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.  */
+@@ -52591,13 +53263,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
+   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
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -52606,8 +53280,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
+@@ -52663,7 +53337,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.  */
+@@ -52716,13 +53392,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
+   break
+ done
+ 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
+@@ -52746,13 +53424,13 @@
+ 
+ 
+ 
+-# Check whether --with-samba or --without-samba was given.
++# Check whether --with-samba was given.
+ if test "${with_samba+set}" = set; then
+-  withval="$with_samba"
+-
++  withval=$with_samba;
+ else
+   with_samba=check
+-fi;
++fi
++
+ 
+ have_libsmbclient=no
+ if test "x$with_samba" != xno; then
+@@ -52761,8 +53439,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'
+@@ -52772,17 +53449,17 @@
+ 
+ 
+    if test "${ac_cv_header_libsmbclient_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
+-echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
++echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libsmbclient_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
++echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking libsmbclient.h usability" >&5
+-echo $ECHO_N "checking libsmbclient.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libsmbclient.h usability" >&5
++echo $ECHO_N "checking libsmbclient.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52819,15 +53496,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 libsmbclient.h presence" >&5
+-echo $ECHO_N "checking libsmbclient.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking libsmbclient.h presence" >&5
++echo $ECHO_N "checking libsmbclient.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -52861,9 +53539,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
+@@ -52887,25 +53566,18 @@
+ echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
+-echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for libsmbclient.h" >&5
++echo $ECHO_N "checking for libsmbclient.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_libsmbclient_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_libsmbclient_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
+-echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_libsmbclient_h" >&5
++echo "${ECHO_T}$ac_cv_header_libsmbclient_h" >&6; }
+ 
+ fi
+ if test $ac_cv_header_libsmbclient_h = yes; then
+@@ -52933,8 +53605,8 @@
+ 	;;
+      esac
+ 
+-echo "$as_me:$LINENO: checking for smbc_new_context in -lsmbclient" >&5
+-echo $ECHO_N "checking for smbc_new_context in -lsmbclient... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for smbc_new_context in -lsmbclient" >&5
++echo $ECHO_N "checking for smbc_new_context in -lsmbclient... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -52947,17 +53619,17 @@
+ 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 smbc_new_context ();
+ int
+ main ()
+ {
+-smbc_new_context ();
++return smbc_new_context ();
+   ;
+   return 0;
+ }
+@@ -52989,14 +53661,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_smbclient_smbc_new_context=no
++	ac_cv_lib_smbclient_smbc_new_context=no
+ fi
++
+ 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_smbclient_smbc_new_context" >&5
+-echo "${ECHO_T}$ac_cv_lib_smbclient_smbc_new_context" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_smbclient_smbc_new_context" >&5
++echo "${ECHO_T}$ac_cv_lib_smbclient_smbc_new_context" >&6; }
+ if test $ac_cv_lib_smbclient_smbc_new_context = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSMBCLIENT 1
+@@ -53013,8 +53686,8 @@
+ 
+ 
+   SMBCLIENT_EXTRA_LIBS=""
+-  echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5
+-echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for yp_get_default_domain" >&5
++echo $ECHO_N "checking for yp_get_default_domain... $ECHO_C" >&6; }
+ if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53041,30 +53714,24 @@
+ 
+ #undef yp_get_default_domain
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char yp_get_default_domain ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_yp_get_default_domain) || defined (__stub___yp_get_default_domain)
++#if defined __stub_yp_get_default_domain || defined __stub___yp_get_default_domain
+ choke me
+-#else
+-char (*f) () = yp_get_default_domain;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != yp_get_default_domain;
++return yp_get_default_domain ();
+   ;
+   return 0;
+ }
+@@ -53096,13 +53763,14 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_yp_get_default_domain=no
++	ac_cv_func_yp_get_default_domain=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5
+-echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_func_yp_get_default_domain" >&5
++echo "${ECHO_T}$ac_cv_func_yp_get_default_domain" >&6; }
+ if test $ac_cv_func_yp_get_default_domain = yes; then
+   :
+ else
+@@ -53116,8 +53784,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
+-echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
++echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53130,17 +53798,17 @@
+ 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 yp_get_default_domain ();
+ int
+ main ()
+ {
+-yp_get_default_domain ();
++return yp_get_default_domain ();
+   ;
+   return 0;
+ }
+@@ -53172,14 +53840,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_nsl_yp_get_default_domain=no
++	ac_cv_lib_nsl_yp_get_default_domain=no
+ fi
++
+ 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_nsl_yp_get_default_domain" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
+ if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
+   SMBCLIENT_EXTRA_LIBS="-lnsl"
+ fi
+@@ -53216,13 +53885,13 @@
+ 
+ 
+ 
+-# Check whether --with-openexr or --without-openexr was given.
++# Check whether --with-openexr was given.
+ if test "${with_openexr+set}" = set; then
+-  withval="$with_openexr"
+-
++  withval=$with_openexr;
+ else
+   with_openexr=check
+-fi;
++fi
++
+ 
+ if test "x$with_openexr" != xno; then
+ 
+@@ -53235,8 +53904,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
+@@ -53251,56 +53920,56 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_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
+ 
+-  echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
+-echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for OpenEXR libraries" >&5
++echo $ECHO_N "checking for OpenEXR libraries... $ECHO_C" >&6; }
+ 
+   if test "$PKG_CONFIG" = "no" ; then
+-     echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++     { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+      echo "*** to the full path to pkg-config."
+      echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+   else
+      if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+-        echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++        { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+         EXRSTATUS=no
+      else
+         if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+-           echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++           { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+            EXRSTATUS=old
+         else
+            kde_save_LIBS="$LIBS"
+            LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `$PKG_CONFIG --libs OpenEXR`"
+ 
+-
+-            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'
+@@ -53361,9 +54030,10 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "ac_cv_libexr=no"
++	eval "ac_cv_libexr=no"
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+            LIBS="$kde_save_LIBS"
+@@ -53383,11 +54053,11 @@
+ _ACEOF
+ 
+                LIB_EXR="$ac_cv_libexr"
+-               echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
+-echo "${ECHO_T}$ac_cv_libexr" >&6
++               { echo "$as_me:$LINENO: result: $ac_cv_libexr" >&5
++echo "${ECHO_T}$ac_cv_libexr" >&6; }
+            else
+-               echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++               { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+                LIB_EXR=""
+            fi
+         fi
+@@ -53419,8 +54089,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'
+@@ -53429,8 +54098,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/Xfixes.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xfixes.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53471,12 +54140,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xfixes_h=no
++	ac_cv_header_X11_extensions_Xfixes_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xfixes_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xfixes_h" >&6; }
+ if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
+   xfixes_h=yes
+ else
+@@ -53502,8 +54172,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
+-echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for XFixesQueryExtension in -lXfixes" >&5
++echo $ECHO_N "checking for XFixesQueryExtension in -lXfixes... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53516,17 +54186,17 @@
+ 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 XFixesQueryExtension ();
+ int
+ main ()
+ {
+-XFixesQueryExtension ();
++return XFixesQueryExtension ();
+   ;
+   return 0;
+ }
+@@ -53558,14 +54228,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xfixes_XFixesQueryExtension=no
++	ac_cv_lib_Xfixes_XFixesQueryExtension=no
+ fi
++
+ 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_Xfixes_XFixesQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xfixes_XFixesQueryExtension" >&5
++echo "${ECHO_T}$ac_cv_lib_Xfixes_XFixesQueryExtension" >&6; }
+ if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
+   LIB_XFIXES=-lXfixes
+ 
+@@ -53593,15 +54264,14 @@
+ 
+ kde_mallinfo_type=
+ 
+-echo "$as_me:$LINENO: checking for mallinfo() in <stdlib.h>" >&5
+-echo $ECHO_N "checking for mallinfo() in <stdlib.h>... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mallinfo() in <stdlib.h>" >&5
++echo $ECHO_N "checking for mallinfo() in <stdlib.h>... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mallinfo_stdlib+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     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'
+@@ -53660,8 +54330,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_mallinfo_stdlib=no
++	kde_cv_func_mallinfo_stdlib=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -53675,20 +54346,19 @@
+ if test "$kde_cv_func_mallinfo_stdlib" = "yes"; then
+     kde_mallinfo_type=stdlib
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_stdlib" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_stdlib" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_stdlib" >&5
++echo "${ECHO_T}$kde_cv_func_mallinfo_stdlib" >&6; }
+ 
+ if test -z "$kde_mallinfo_type"; then
+ 
+-echo "$as_me:$LINENO: checking for mallinfo() in <malloc.h>" >&5
+-echo $ECHO_N "checking for mallinfo() in <malloc.h>... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for mallinfo() in <malloc.h>" >&5
++echo $ECHO_N "checking for mallinfo() in <malloc.h>... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mallinfo_malloc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     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'
+@@ -53747,8 +54417,9 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-kde_cv_func_mallinfo_malloc=no
++	kde_cv_func_mallinfo_malloc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -53762,8 +54433,8 @@
+ if test "$kde_cv_func_mallinfo_malloc" = "yes"; then
+     kde_mallinfo_type=malloc
+ fi
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_malloc" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_malloc" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_malloc" >&5
++echo "${ECHO_T}$kde_cv_func_mallinfo_malloc" >&6; }
+ 
+ fi
+ 
+@@ -53774,17 +54445,17 @@
+ 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 mallinfo ();
+ int
+ main ()
+ {
+-mallinfo ();
++return mallinfo ();
+   ;
+   return 0;
+ }
+@@ -53816,8 +54487,8 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+- echo "$as_me:$LINENO: checking for mallinfo in -lmalloc" >&5
+-echo $ECHO_N "checking for mallinfo in -lmalloc... $ECHO_C" >&6
++	 { echo "$as_me:$LINENO: checking for mallinfo in -lmalloc" >&5
++echo $ECHO_N "checking for mallinfo in -lmalloc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_malloc_mallinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -53830,17 +54501,17 @@
+ 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 mallinfo ();
+ int
+ main ()
+ {
+-mallinfo ();
++return mallinfo ();
+   ;
+   return 0;
+ }
+@@ -53872,14 +54543,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_malloc_mallinfo=no
++	ac_cv_lib_malloc_mallinfo=no
+ fi
++
+ 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_malloc_mallinfo" >&5
+-echo "${ECHO_T}$ac_cv_lib_malloc_mallinfo" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_malloc_mallinfo" >&5
++echo "${ECHO_T}$ac_cv_lib_malloc_mallinfo" >&6; }
+ if test $ac_cv_lib_malloc_mallinfo = yes; then
+    LIBMALLOC="-lmalloc"
+ 
+@@ -53889,20 +54561,20 @@
+ 
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+ if test -n "$kde_mallinfo_type"; then
+ 
+-echo "$as_me:$LINENO: checking whether to use mallinfo field hblkhd" >&5
+-echo $ECHO_N "checking whether to use mallinfo field hblkhd... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to use mallinfo field hblkhd" >&5
++echo $ECHO_N "checking whether to use mallinfo field hblkhd... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mallinfo_field_hblkhd+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     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'
+@@ -54005,8 +54677,10 @@
+ ( exit $ac_status )
+ kde_cv_func_mallinfo_field_hblkhd=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -54016,8 +54690,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_hblkhd" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_field_hblkhd" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_hblkhd" >&5
++echo "${ECHO_T}$kde_cv_func_mallinfo_field_hblkhd" >&6; }
+ kde_mallinfo_hblkhd=$kde_cv_func_mallinfo_field_hblkhd
+ if test "$kde_mallinfo_hblkhd" = "yes"; then
+ 
+@@ -54028,15 +54702,14 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether to use mallinfo field uordblks" >&5
+-echo $ECHO_N "checking whether to use mallinfo field uordblks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to use mallinfo field uordblks" >&5
++echo $ECHO_N "checking whether to use mallinfo field uordblks... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mallinfo_field_uordblks+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     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'
+@@ -54139,8 +54812,10 @@
+ ( exit $ac_status )
+ kde_cv_func_mallinfo_field_uordblks=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -54150,8 +54825,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_uordblks" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_field_uordblks" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_uordblks" >&5
++echo "${ECHO_T}$kde_cv_func_mallinfo_field_uordblks" >&6; }
+ kde_mallinfo_uordblks=$kde_cv_func_mallinfo_field_uordblks
+ if test "$kde_mallinfo_uordblks" = "yes"; then
+ 
+@@ -54162,15 +54837,14 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking whether to use mallinfo field usmblks" >&5
+-echo $ECHO_N "checking whether to use mallinfo field usmblks... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether to use mallinfo field usmblks" >&5
++echo $ECHO_N "checking whether to use mallinfo field usmblks... $ECHO_C" >&6; }
+ if test "${kde_cv_func_mallinfo_field_usmblks+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ 
+-
+-     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'
+@@ -54273,8 +54947,10 @@
+ ( exit $ac_status )
+ kde_cv_func_mallinfo_field_usmblks=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -54284,8 +54960,8 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_usmblks" >&5
+-echo "${ECHO_T}$kde_cv_func_mallinfo_field_usmblks" >&6
++{ echo "$as_me:$LINENO: result: $kde_cv_func_mallinfo_field_usmblks" >&5
++echo "${ECHO_T}$kde_cv_func_mallinfo_field_usmblks" >&6; }
+ kde_mallinfo_usmblks=$kde_cv_func_mallinfo_field_usmblks
+ if test "$kde_mallinfo_usmblks" = "yes"; then
+ 
+@@ -54317,14 +54993,14 @@
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether we can use openpty" >&5
+-echo $ECHO_N "checking whether we can use openpty... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking whether we can use openpty" >&5
++echo $ECHO_N "checking whether we can use openpty... $ECHO_C" >&6; }
+ ac_use_openpty="yes"
+-# Check whether --enable-openpty or --disable-openpty was given.
++# Check whether --enable-openpty was given.
+ if test "${enable_openpty+set}" = set; then
+-  enableval="$enable_openpty"
+-  ac_use_openpty="no"
+-fi;
++  enableval=$enable_openpty; ac_use_openpty="no"
++fi
++
+ if test "$ac_use_openpty" = "yes"; then
+ 	kde_safe_LIBS=$LIBS
+ 	LIBS="$LIBS $LIBUTIL"
+@@ -54374,8 +55050,10 @@
+ ( exit $ac_status )
+ ac_use_openpty="no"
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ 	LIBS=$kde_safe_LIBS
+ fi
+ if test "$ac_use_openpty" = "yes"; then
+@@ -54384,21 +55062,21 @@
+ #define HAVE_OPENPTY 1
+ _ACEOF
+ 
+-	echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++	{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ else
+-	echo "$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 how cwd can be be found by seperate process" >&5
+-echo $ECHO_N "checking how cwd can be be found by seperate process... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking how cwd can be be found by seperate process" >&5
++echo $ECHO_N "checking how cwd can be be found by seperate process... $ECHO_C" >&6; }
+ case "$host" in
+   *-*-linux*) cwd_method='proc' ;;
+ 	*) cwd_method='no' ;;
+ esac
+-echo "$as_me:$LINENO: result: $cwd_method" >&5
+-echo "${ECHO_T}$cwd_method" >&6
++{ echo "$as_me:$LINENO: result: $cwd_method" >&5
++echo "${ECHO_T}$cwd_method" >&6; }
+ 
+ case "$cwd_method" in
+ 	proc)
+@@ -54414,9 +55092,9 @@
+ for ac_func in _IceTransNoListen
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -54442,30 +55120,24 @@
+ 
+ #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;
+ }
+@@ -54497,13 +55169,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
+@@ -54517,11 +55191,11 @@
+ LIB_XINERAMA=
+ 
+ 
+-# Check whether --with-xinerama or --without-xinerama was given.
++# Check whether --with-xinerama was given.
+ if test "${with_xinerama+set}" = set; then
+-  withval="$with_xinerama"
++  withval=$with_xinerama;
++fi
+ 
+-fi;
+ 
+ if test "x$with_xinerama" != "xno"; then
+   xinerama_save_ldflags="$LDFLAGS"
+@@ -54531,8 +55205,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'
+@@ -54541,8 +55214,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
+-echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5
++echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -54585,16 +55258,17 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_Xinerama_h=no
++	ac_cv_header_X11_extensions_Xinerama_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6; }
+ if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then
+ 
+-    echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
+-echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6
++    { echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5
++echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -54607,17 +55281,17 @@
+ 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 XineramaQueryExtension ();
+ int
+ main ()
+ {
+-XineramaQueryExtension ();
++return XineramaQueryExtension ();
+   ;
+   return 0;
+ }
+@@ -54649,14 +55323,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_Xinerama_XineramaQueryExtension=no
++	ac_cv_lib_Xinerama_XineramaQueryExtension=no
+ fi
++
+ 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_Xinerama_XineramaQueryExtension" >&5
+-echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5
++echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; }
+ if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
+ 
+ 
+@@ -54686,8 +55361,8 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking if ksysguardd can be compiled" >&5
+-echo $ECHO_N "checking if ksysguardd can be compiled... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking if ksysguardd can be compiled" >&5
++echo $ECHO_N "checking if ksysguardd can be compiled... $ECHO_C" >&6; }
+ case "$host" in
+   *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
+   *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+@@ -54699,8 +55374,8 @@
+   *) ksysguardd_compile=no; UNAME='' ;;
+ esac
+ 
+-echo "$as_me:$LINENO: result: $ksysguardd_compile" >&5
+-echo "${ECHO_T}$ksysguardd_compile" >&6
++{ echo "$as_me:$LINENO: result: $ksysguardd_compile" >&5
++echo "${ECHO_T}$ksysguardd_compile" >&6; }
+ 
+ 
+ 
+@@ -54785,23 +55460,22 @@
+ 
+ 
+ 
+-# Check whether --with-sensors or --without-sensors was given.
++# Check whether --with-sensors was given.
+ if test "${with_sensors+set}" = set; then
+-  withval="$with_sensors"
+-
++  withval=$with_sensors;
+ else
+   with_sensors=check
+-fi;
++fi
+ 
+-if test "x$with_sensors" != xno; then
+ 
++if test "x$with_sensors" != xno; then
+ 
+ 
+ 
+ 
+    kde_safe_cppflags=$CPPFLAGS
+    CPPFLAGS="$CPPFLAGS $all_includes"
+-    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'
+@@ -54814,18 +55488,19 @@
+ for ac_header in sensors/sensors.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$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
+@@ -54862,15 +55537,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
+@@ -54904,9 +55580,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
+@@ -54930,25 +55607,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
+@@ -54977,8 +55648,8 @@
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for sensors_init in -lsensors" >&5
+-echo $ECHO_N "checking for sensors_init in -lsensors... $ECHO_C" >&6
++     { echo "$as_me:$LINENO: checking for sensors_init in -lsensors" >&5
++echo $ECHO_N "checking for sensors_init in -lsensors... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_sensors_sensors_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -54991,17 +55662,17 @@
+ 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 sensors_init ();
+ int
+ main ()
+ {
+-sensors_init ();
++return sensors_init ();
+   ;
+   return 0;
+ }
+@@ -55033,14 +55704,15 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_sensors_sensors_init=no
++	ac_cv_lib_sensors_sensors_init=no
+ fi
++
+ 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_sensors_sensors_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_sensors_sensors_init" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_sensors_sensors_init" >&5
++echo "${ECHO_T}$ac_cv_lib_sensors_sensors_init" >&6; }
+ if test $ac_cv_lib_sensors_sensors_init = yes; then
+   LIBSENSORS="-lsensors"
+ fi
+@@ -55077,16 +55749,16 @@
+ 
+ #MIN_CONFIG
+ 
+-# Check whether --enable-dnssd or --disable-dnssd was given.
++# Check whether --enable-dnssd was given.
+ if test "${enable_dnssd+set}" = set; then
+-  enableval="$enable_dnssd"
+-  with_dnssd=$enableval
++  enableval=$enable_dnssd; with_dnssd=$enableval
+ else
+   with_dnssd=yes
+-fi;
++fi
++
+ if test "$with_dnssd" = "yes"; then
+-echo "$as_me:$LINENO: checking for DNS-SD support" >&5
+-echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for DNS-SD support" >&5
++echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6; }
+ save_dnssdtest_LIBS="$LIBS"
+ save_dnssdtest_LDFLAGS="$LDFLAGS"
+ save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+@@ -55150,19 +55822,20 @@
+ 				*) LIB_DNSSD="-ldns_sd" ;;
+ 			esac
+ 			have_libdns_sd="yes"
+-			echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++			{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+-			echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++			{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+                         LIB_DNSSD=""
+ 
+ fi
++
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ CPPFLAGS=$save_dnssdtest_CPPFLAGS
+@@ -55186,10 +55859,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'
+@@ -55202,9 +55874,9 @@
+ for ac_header in X11/extensions/Xdamage.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -55244,12 +55916,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
+@@ -55273,10 +55947,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'
+@@ -55289,9 +55962,9 @@
+ for ac_header in X11/extensions/Xcomposite.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -55331,12 +56004,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
+@@ -55360,10 +56035,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'
+@@ -55376,9 +56050,9 @@
+ for ac_header in X11/extensions/Xrender.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+@@ -55418,12 +56092,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
+@@ -55462,8 +56138,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'
+@@ -55473,17 +56148,17 @@
+ 
+ 
+    if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
+-echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6
++  { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
++echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5
+-echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/Xlib.h usability" >&5
++echo $ECHO_N "checking X11/Xlib.h usability... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -55520,15 +56195,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 X11/Xlib.h presence" >&5
+-echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking X11/Xlib.h presence" >&5
++echo $ECHO_N "checking X11/Xlib.h presence... $ECHO_C" >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -55562,9 +56238,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
+@@ -55588,25 +56265,18 @@
+ echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
+     { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
+ echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
+-## ------------------------------------------ ##
+-## Report this to the AC_PACKAGE_NAME lists.  ##
+-## ------------------------------------------ ##
+-_ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
+-echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
++echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_header_X11_Xlib_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; }
+ 
+ fi
+ 
+@@ -55623,8 +56293,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'
+@@ -55633,8 +56302,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/XKBstr.h" >&5
++echo $ECHO_N "checking for X11/extensions/XKBstr.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -55677,12 +56346,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_XKBstr_h=no
++	ac_cv_header_X11_extensions_XKBstr_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBstr_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBstr_h" >&6; }
+ if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
+   :
+ else
+@@ -55702,8 +56372,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'
+@@ -55712,8 +56381,8 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-   echo "$as_me:$LINENO: checking for X11/extensions/XKBrules.h" >&5
+-echo $ECHO_N "checking for X11/extensions/XKBrules.h... $ECHO_C" >&6
++   { echo "$as_me:$LINENO: checking for X11/extensions/XKBrules.h" >&5
++echo $ECHO_N "checking for X11/extensions/XKBrules.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XKBrules_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -55758,12 +56427,13 @@
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_X11_extensions_XKBrules_h=no
++	ac_cv_header_X11_extensions_XKBrules_h=no
+ fi
++
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBrules_h" >&5
+-echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBrules_h" >&6
++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XKBrules_h" >&5
++echo "${ECHO_T}$ac_cv_header_X11_extensions_XKBrules_h" >&6; }
+ if test $ac_cv_header_X11_extensions_XKBrules_h = yes; then
+   :
+ else
+@@ -55800,8 +56470,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
+@@ -55812,8 +56482,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"
+@@ -57265,39 +57935,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
+@@ -57306,38 +57995,31 @@
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[	 ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[	 ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++  ac_i=`echo "$ac_i" | sed "$ac_script"`
++  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
++  #    will be set to the directory where LIBOBJS objects are built.
++  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -18224,46 +41388,3933 @@
  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
-@@ -58944,6 +58250,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
-+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+s, at MAINT@,$MAINT,;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
-@@ -59532,11 +58841,6 @@
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+@@ -57922,11 +58604,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
+@@ -57935,8 +58641,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='+ '
+@@ -57950,18 +58691,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
+@@ -57969,159 +58711,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 (dirname -- /) >/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=:
+@@ -58130,7 +58833,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'"
+@@ -58139,31 +58854,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="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++generated by GNU Autoconf 2.59d.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -58171,30 +58869,20 @@
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+ 
++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
+-
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
+-
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+ 
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++_ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+@@ -58221,19 +58909,21 @@
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+-_ACEOF
+ 
++_ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.59,
++configured by $0, generated by GNU Autoconf 2.59d,
+   with options \\"`echo "$ac_configure_args" | sed '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
+@@ -58244,39 +58934,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
+@@ -58286,18 +58961,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
+@@ -58313,527 +58994,539 @@
+ _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" ;;
+-  "applnk/Makefile" ) CONFIG_FILES="$CONFIG_FILES applnk/Makefile" ;;
+-  "applnk/compat/Makefile" ) CONFIG_FILES="$CONFIG_FILES applnk/compat/Makefile" ;;
+-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+-  "doc/faq/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/faq/Makefile" ;;
+-  "doc/glossary/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/glossary/Makefile" ;;
+-  "doc/kappfinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kappfinder/Makefile" ;;
+-  "doc/kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kate/Makefile" ;;
+-  "doc/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/Makefile" ;;
+-  "doc/kcontrol/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/arts/Makefile" ;;
+-  "doc/kcontrol/background/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/background/Makefile" ;;
+-  "doc/kcontrol/bell/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/bell/Makefile" ;;
+-  "doc/kcontrol/cache/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cache/Makefile" ;;
+-  "doc/kcontrol/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/clock/Makefile" ;;
+-  "doc/kcontrol/colors/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/colors/Makefile" ;;
+-  "doc/kcontrol/cookies/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cookies/Makefile" ;;
+-  "doc/kcontrol/crypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/crypto/Makefile" ;;
+-  "doc/kcontrol/desktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktop/Makefile" ;;
+-  "doc/kcontrol/desktopbehavior/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktopbehavior/Makefile" ;;
+-  "doc/kcontrol/ebrowsing/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/ebrowsing/Makefile" ;;
+-  "doc/kcontrol/email/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/email/Makefile" ;;
+-  "doc/kcontrol/energy/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/energy/Makefile" ;;
+-  "doc/kcontrol/filemanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filemanager/Makefile" ;;
+-  "doc/kcontrol/filetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filetypes/Makefile" ;;
+-  "doc/kcontrol/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/fonts/Makefile" ;;
+-  "doc/kcontrol/helpindex/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/helpindex/Makefile" ;;
+-  "doc/kcontrol/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/icons/Makefile" ;;
+-  "doc/kcontrol/kcmaccess/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmaccess/Makefile" ;;
+-  "doc/kcontrol/kcmcss/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmcss/Makefile" ;;
+-  "doc/kcontrol/kcmfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmfontinst/Makefile" ;;
+-  "doc/kcontrol/kcmkonsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmkonsole/Makefile" ;;
+-  "doc/kcontrol/kcmlaunch/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmlaunch/Makefile" ;;
+-  "doc/kcontrol/kcmnotify/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmnotify/Makefile" ;;
+-  "doc/kcontrol/kcmsmserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmsmserver/Makefile" ;;
+-  "doc/kcontrol/kcmstyle/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmstyle/Makefile" ;;
+-  "doc/kcontrol/kcmtaskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmtaskbar/Makefile" ;;
+-  "doc/kcontrol/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kdm/Makefile" ;;
+-  "doc/kcontrol/keyboard/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keyboard/Makefile" ;;
+-  "doc/kcontrol/keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keys/Makefile" ;;
+-  "doc/kcontrol/khtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/khtml/Makefile" ;;
+-  "doc/kcontrol/kwindecoration/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kwindecoration/Makefile" ;;
+-  "doc/kcontrol/language/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/language/Makefile" ;;
+-  "doc/kcontrol/mouse/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/mouse/Makefile" ;;
+-  "doc/kcontrol/netpref/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/netpref/Makefile" ;;
+-  "doc/kcontrol/panel/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panel/Makefile" ;;
+-  "doc/kcontrol/panelappearance/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panelappearance/Makefile" ;;
+-  "doc/kcontrol/passwords/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/passwords/Makefile" ;;
+-  "doc/kcontrol/performance/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/performance/Makefile" ;;
+-  "doc/kcontrol/proxy/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/proxy/Makefile" ;;
+-  "doc/kcontrol/screensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/screensaver/Makefile" ;;
+-  "doc/kcontrol/smb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/smb/Makefile" ;;
+-  "doc/kcontrol/spellchecking/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/spellchecking/Makefile" ;;
+-  "doc/kcontrol/useragent/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/useragent/Makefile" ;;
+-  "doc/kcontrol/windowmanagement/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kcontrol/windowmanagement/Makefile" ;;
+-  "doc/kdcop/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdcop/Makefile" ;;
+-  "doc/kdebugdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdebugdialog/Makefile" ;;
+-  "doc/kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdeprint/Makefile" ;;
+-  "doc/kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdesu/Makefile" ;;
+-  "doc/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kdm/Makefile" ;;
+-  "doc/kfind/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kfind/Makefile" ;;
+-  "doc/khelpcenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/khelpcenter/Makefile" ;;
+-  "doc/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kicker/Makefile" ;;
+-  "doc/kinfocenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/Makefile" ;;
+-  "doc/kinfocenter/devices/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/devices/Makefile" ;;
+-  "doc/kinfocenter/dma/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/dma/Makefile" ;;
+-  "doc/kinfocenter/interrupts/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/interrupts/Makefile" ;;
+-  "doc/kinfocenter/ioports/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/ioports/Makefile" ;;
+-  "doc/kinfocenter/memory/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/memory/Makefile" ;;
+-  "doc/kinfocenter/nics/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/nics/Makefile" ;;
+-  "doc/kinfocenter/opengl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/opengl/Makefile" ;;
+-  "doc/kinfocenter/partitions/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/partitions/Makefile" ;;
+-  "doc/kinfocenter/pci/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pci/Makefile" ;;
+-  "doc/kinfocenter/pcmcia/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pcmcia/Makefile" ;;
+-  "doc/kinfocenter/processor/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/processor/Makefile" ;;
+-  "doc/kinfocenter/protocols/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/protocols/Makefile" ;;
+-  "doc/kinfocenter/samba/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/samba/Makefile" ;;
+-  "doc/kinfocenter/scsi/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/scsi/Makefile" ;;
+-  "doc/kinfocenter/sound/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/sound/Makefile" ;;
+-  "doc/kinfocenter/usb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/usb/Makefile" ;;
+-  "doc/kinfocenter/xserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/xserver/Makefile" ;;
+-  "doc/kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kioslave/Makefile" ;;
+-  "doc/klipper/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/klipper/Makefile" ;;
+-  "doc/kmenuedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kmenuedit/Makefile" ;;
+-  "doc/knetattach/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/knetattach/Makefile" ;;
+-  "doc/kompmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kompmgr/Makefile" ;;
+-  "doc/konqueror/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konqueror/Makefile" ;;
+-  "doc/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konsole/Makefile" ;;
+-  "doc/kpager/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kpager/Makefile" ;;
+-  "doc/ksplashml/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksplashml/Makefile" ;;
+-  "doc/ksysguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ksysguard/Makefile" ;;
+-  "doc/kwrite/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kwrite/Makefile" ;;
+-  "doc/kxkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/kxkb/Makefile" ;;
+-  "doc/quickstart/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/quickstart/Makefile" ;;
+-  "doc/userguide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/userguide/Makefile" ;;
+-  "doc/visualdict/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/visualdict/Makefile" ;;
+-  "drkonqi/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/Makefile" ;;
+-  "drkonqi/debuggers/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/debuggers/Makefile" ;;
+-  "drkonqi/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/pics/Makefile" ;;
+-  "drkonqi/presets/Makefile" ) CONFIG_FILES="$CONFIG_FILES drkonqi/presets/Makefile" ;;
+-  "kappfinder/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/Makefile" ;;
+-  "kappfinder/apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Makefile" ;;
+-  "kappfinder/apps/Development/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Development/Makefile" ;;
+-  "kappfinder/apps/Games/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Makefile" ;;
+-  "kappfinder/apps/Games/Arcade/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Arcade/Makefile" ;;
+-  "kappfinder/apps/Games/Board/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Board/Makefile" ;;
+-  "kappfinder/apps/Games/Card/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Card/Makefile" ;;
+-  "kappfinder/apps/Games/Emulators/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Emulators/Makefile" ;;
+-  "kappfinder/apps/Games/Roguelikes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Roguelikes/Makefile" ;;
+-  "kappfinder/apps/Games/TacticStrategy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/TacticStrategy/Makefile" ;;
+-  "kappfinder/apps/Games/Toys/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Toys/Makefile" ;;
+-  "kappfinder/apps/Graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Graphics/Makefile" ;;
+-  "kappfinder/apps/Internet/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Makefile" ;;
+-  "kappfinder/apps/Internet/Terminal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Terminal/Makefile" ;;
+-  "kappfinder/apps/Multimedia/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Multimedia/Makefile" ;;
+-  "kappfinder/apps/Office/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Office/Makefile" ;;
+-  "kappfinder/apps/System/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Makefile" ;;
+-  "kappfinder/apps/System/Terminal/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Terminal/Makefile" ;;
+-  "kappfinder/apps/Utilities/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Makefile" ;;
+-  "kappfinder/apps/Utilities/Editors/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Editors/Makefile" ;;
+-  "kappfinder/apps/Utilities/xutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/xutils/Makefile" ;;
+-  "kate/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/Makefile" ;;
+-  "kate/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/app/Makefile" ;;
+-  "kate/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/data/Makefile" ;;
+-  "kate/interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/interfaces/Makefile" ;;
+-  "kate/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/pics/Makefile" ;;
+-  "kate/pics/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/pics/actions/Makefile" ;;
+-  "kate/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES kate/utils/Makefile" ;;
+-  "kcheckpass/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcheckpass/Makefile" ;;
+-  "kcminit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcminit/Makefile" ;;
+-  "kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/Makefile" ;;
+-  "kcontrol/access/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/access/Makefile" ;;
+-  "kcontrol/accessibility/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/accessibility/Makefile" ;;
+-  "kcontrol/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/arts/Makefile" ;;
+-  "kcontrol/background/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/background/Makefile" ;;
+-  "kcontrol/background/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/background/pics/Makefile" ;;
+-  "kcontrol/bell/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/bell/Makefile" ;;
+-  "kcontrol/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/clock/Makefile" ;;
+-  "kcontrol/colors/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/colors/Makefile" ;;
+-  "kcontrol/componentchooser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/Makefile" ;;
+-  "kcontrol/componentchooser/componentservices/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/componentservices/Makefile" ;;
+-  "kcontrol/crypto/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/crypto/Makefile" ;;
+-  "kcontrol/css/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/css/Makefile" ;;
+-  "kcontrol/display/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/display/Makefile" ;;
+-  "kcontrol/dnssd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/dnssd/Makefile" ;;
+-  "kcontrol/ebrowsing/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/ikws/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/localdomain/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/localdomain/Makefile" ;;
+-  "kcontrol/ebrowsing/plugins/shorturi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/shorturi/Makefile" ;;
+-  "kcontrol/energy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/energy/Makefile" ;;
+-  "kcontrol/energy/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/energy/pics/Makefile" ;;
+-  "kcontrol/filetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/filetypes/Makefile" ;;
+-  "kcontrol/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/fonts/Makefile" ;;
+-  "kcontrol/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/icons/Makefile" ;;
+-  "kcontrol/info/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/info/Makefile" ;;
+-  "kcontrol/input/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/Makefile" ;;
+-  "kcontrol/input/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/core/Makefile" ;;
+-  "kcontrol/input/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/pics/Makefile" ;;
+-  "kcontrol/input/xcursor/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/input/xcursor/Makefile" ;;
+-  "kcontrol/ioslaveinfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/ioslaveinfo/Makefile" ;;
+-  "kcontrol/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/joystick/Makefile" ;;
+-  "kcontrol/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/Makefile" ;;
+-  "kcontrol/kcontrol/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/about/Makefile" ;;
+-  "kcontrol/kded/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kded/Makefile" ;;
+-  "kcontrol/kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kdm/Makefile" ;;
+-  "kcontrol/keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/keys/Makefile" ;;
+-  "kcontrol/kfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/Makefile" ;;
+-  "kcontrol/kfontinst/kcmfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kcmfontinst/Makefile" ;;
+-  "kcontrol/kfontinst/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfile-plugin/Makefile" ;;
+-  "kcontrol/kfontinst/kfontinst/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfontinst/Makefile" ;;
+-  "kcontrol/kfontinst/kio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kio/Makefile" ;;
+-  "kcontrol/kfontinst/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/lib/Makefile" ;;
+-  "kcontrol/kfontinst/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/thumbnail/Makefile" ;;
+-  "kcontrol/kfontinst/viewpart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/viewpart/Makefile" ;;
+-  "kcontrol/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kicker/Makefile" ;;
+-  "kcontrol/kio/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kio/Makefile" ;;
+-  "kcontrol/kio/uasproviders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kio/uasproviders/Makefile" ;;
+-  "kcontrol/knotify/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/Makefile" ;;
+-  "kcontrol/knotify/sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/sounds/Makefile" ;;
+-  "kcontrol/konq/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konq/Makefile" ;;
+-  "kcontrol/konqhtml/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konqhtml/Makefile" ;;
+-  "kcontrol/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/konsole/Makefile" ;;
+-  "kcontrol/krdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/Makefile" ;;
+-  "kcontrol/krdb/ad/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/ad/Makefile" ;;
+-  "kcontrol/krdb/kcs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/kcs/Makefile" ;;
+-  "kcontrol/krdb/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/pics/Makefile" ;;
+-  "kcontrol/krdb/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastDark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastDark-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark-big/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastLight/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight/Makefile" ;;
+-  "kcontrol/krdb/themes/HighContrastLight-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight-big/Makefile" ;;
+-  "kcontrol/krdb/themes/KDE_Classic/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/KDE_Classic/Makefile" ;;
+-  "kcontrol/krdb/themes/Keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Keramik/Makefile" ;;
+-  "kcontrol/krdb/themes/Plastik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Plastik/Makefile" ;;
+-  "kcontrol/krdb/themes/Platinum/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Platinum/Makefile" ;;
+-  "kcontrol/krdb/themes/Redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Redmond/Makefile" ;;
+-  "kcontrol/krdb/themes/Sunshine/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Sunshine/Makefile" ;;
+-  "kcontrol/krdb/themes/YellowOnBlue/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue/Makefile" ;;
+-  "kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ;;
+-  "kcontrol/kthememanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/kthememanager/Makefile" ;;
+-  "kcontrol/launch/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/launch/Makefile" ;;
+-  "kcontrol/locale/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/Makefile" ;;
+-  "kcontrol/locale/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/default/Makefile" ;;
+-  "kcontrol/locale/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/locale/pics/Makefile" ;;
+-  "kcontrol/nics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/nics/Makefile" ;;
+-  "kcontrol/performance/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/performance/Makefile" ;;
+-  "kcontrol/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/pics/Makefile" ;;
+-  "kcontrol/privacy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/privacy/Makefile" ;;
+-  "kcontrol/randr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/randr/Makefile" ;;
+-  "kcontrol/samba/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/samba/Makefile" ;;
+-  "kcontrol/screensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/screensaver/Makefile" ;;
+-  "kcontrol/smartcard/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/smartcard/Makefile" ;;
+-  "kcontrol/smserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/smserver/Makefile" ;;
+-  "kcontrol/spellchecking/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/spellchecking/Makefile" ;;
+-  "kcontrol/style/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/style/Makefile" ;;
+-  "kcontrol/style/keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/style/keramik/Makefile" ;;
+-  "kcontrol/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/taskbar/Makefile" ;;
+-  "kcontrol/usbview/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/usbview/Makefile" ;;
+-  "kcontrol/view1394/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/view1394/Makefile" ;;
+-  "kcontrol/xinerama/Makefile" ) CONFIG_FILES="$CONFIG_FILES kcontrol/xinerama/Makefile" ;;
+-  "kdcop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdcop/Makefile" ;;
+-  "kdebugdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdebugdialog/Makefile" ;;
+-  "kdeeject/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeeject/Makefile" ;;
+-  "kdepasswd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/Makefile" ;;
+-  "kdepasswd/kcm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/Makefile" ;;
+-  "kdepasswd/kcm/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/pics/Makefile" ;;
+-  "kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/Makefile" ;;
+-  "kdeprint/descriptions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/descriptions/Makefile" ;;
+-  "kdeprint/kdeprint_part/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprint_part/Makefile" ;;
+-  "kdeprint/kdeprintfax/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprintfax/Makefile" ;;
+-  "kdeprint/kjobviewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kjobviewer/Makefile" ;;
+-  "kdeprint/kprinter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/kprinter/Makefile" ;;
+-  "kdeprint/printmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/printmgr/Makefile" ;;
+-  "kdeprint/slave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/Makefile" ;;
+-  "kdeprint/slave/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/mimetypes/Makefile" ;;
+-  "kdeprint/slave/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdeprint/slave/templates/Makefile" ;;
+-  "kdesktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/Makefile" ;;
+-  "kdesktop/init/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/init/Makefile" ;;
+-  "kdesktop/init/Templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/init/Templates/Makefile" ;;
+-  "kdesktop/kwebdesktop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/kwebdesktop/Makefile" ;;
+-  "kdesktop/lock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/lock/Makefile" ;;
+-  "kdesktop/patterns/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/patterns/Makefile" ;;
+-  "kdesktop/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/pics/Makefile" ;;
+-  "kdesktop/programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesktop/programs/Makefile" ;;
+-  "kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/Makefile" ;;
+-  "kdesu/kdesu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/kdesu/Makefile" ;;
+-  "kdesu/kdesud/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdesu/kdesud/Makefile" ;;
+-  "kdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdialog/Makefile" ;;
+-  "kdm/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/Makefile" ;;
+-  "kdm/backend/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/backend/Makefile" ;;
+-  "kdm/kfrontend/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/Makefile" ;;
+-  "kdm/kfrontend/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/pics/Makefile" ;;
+-  "kdm/kfrontend/sessions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/Makefile" ;;
+-  "kdm/kfrontend/themer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themer/Makefile" ;;
+-  "kdm/kfrontend/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/Makefile" ;;
+-  "kdm/kfrontend/themes/circles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/circles/Makefile" ;;
+-  "kdmlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdmlib/Makefile" ;;
+-  "kfind/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfind/Makefile" ;;
+-  "kfind/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kfind/pics/Makefile" ;;
+-  "khelpcenter/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/Makefile" ;;
+-  "khelpcenter/htmlsearch/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/htmlsearch/Makefile" ;;
+-  "khelpcenter/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/pics/Makefile" ;;
+-  "khelpcenter/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Makefile" ;;
+-  "khelpcenter/plugins/Applications/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Applications/Makefile" ;;
+-  "khelpcenter/plugins/Manpages/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Manpages/Makefile" ;;
+-  "khelpcenter/plugins/Scrollkeeper/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Scrollkeeper/Makefile" ;;
+-  "khelpcenter/plugins/Tutorials/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Tutorials/Makefile" ;;
+-  "khelpcenter/searchhandlers/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/Makefile" ;;
+-  "khotkeys/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/Makefile" ;;
+-  "khotkeys/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/app/Makefile" ;;
+-  "khotkeys/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/arts/Makefile" ;;
+-  "khotkeys/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/data/Makefile" ;;
+-  "khotkeys/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/Makefile" ;;
+-  "khotkeys/kcontrol/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/ui/Makefile" ;;
+-  "khotkeys/shared/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/shared/Makefile" ;;
+-  "khotkeys/update/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/update/Makefile" ;;
+-  "kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/Makefile" ;;
+-  "kicker/applets/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/Makefile" ;;
+-  "kicker/applets/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/clock/Makefile" ;;
+-  "kicker/applets/launcher/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/launcher/Makefile" ;;
+-  "kicker/applets/lockout/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/lockout/Makefile" ;;
+-  "kicker/applets/media/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/media/Makefile" ;;
+-  "kicker/applets/menu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/menu/Makefile" ;;
+-  "kicker/applets/minipager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/minipager/Makefile" ;;
+-  "kicker/applets/naughty/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/naughty/Makefile" ;;
+-  "kicker/applets/run/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/run/Makefile" ;;
+-  "kicker/applets/swallow/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/swallow/Makefile" ;;
+-  "kicker/applets/systemtray/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/systemtray/Makefile" ;;
+-  "kicker/applets/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/taskbar/Makefile" ;;
+-  "kicker/applets/trash/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/applets/trash/Makefile" ;;
+-  "kicker/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/Makefile" ;;
+-  "kicker/data/app_start_anim/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/app_start_anim/Makefile" ;;
+-  "kicker/data/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/icons/Makefile" ;;
+-  "kicker/data/icons/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/icons/actions/Makefile" ;;
+-  "kicker/data/kmenu_side/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/kmenu_side/Makefile" ;;
+-  "kicker/data/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/tiles/Makefile" ;;
+-  "kicker/data/wallpaper/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/data/wallpaper/Makefile" ;;
+-  "kicker/extensions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/Makefile" ;;
+-  "kicker/extensions/dockbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/dockbar/Makefile" ;;
+-  "kicker/extensions/kasbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/kasbar/Makefile" ;;
+-  "kicker/extensions/sidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/sidebar/Makefile" ;;
+-  "kicker/extensions/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/extensions/taskbar/Makefile" ;;
+-  "kicker/kicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/Makefile" ;;
+-  "kicker/kicker/buttons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/buttons/Makefile" ;;
+-  "kicker/kicker/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/core/Makefile" ;;
+-  "kicker/kicker/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/kicker/ui/Makefile" ;;
+-  "kicker/libkicker/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/libkicker/Makefile" ;;
+-  "kicker/menuext/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/Makefile" ;;
+-  "kicker/menuext/find/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/find/Makefile" ;;
+-  "kicker/menuext/kdeprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/kdeprint/Makefile" ;;
+-  "kicker/menuext/konq-profiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/konq-profiles/Makefile" ;;
+-  "kicker/menuext/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/konsole/Makefile" ;;
+-  "kicker/menuext/prefmenu/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/prefmenu/Makefile" ;;
+-  "kicker/menuext/recentdocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/recentdocs/Makefile" ;;
+-  "kicker/menuext/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/remote/Makefile" ;;
+-  "kicker/menuext/system/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/system/Makefile" ;;
+-  "kicker/menuext/tom/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/menuext/tom/Makefile" ;;
+-  "kicker/proxy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/proxy/Makefile" ;;
+-  "kicker/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/taskbar/Makefile" ;;
+-  "kicker/taskmanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kicker/taskmanager/Makefile" ;;
+-  "kioslave/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/Makefile" ;;
+-  "kioslave/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/about/Makefile" ;;
+-  "kioslave/cgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/cgi/Makefile" ;;
+-  "kioslave/cgi/kcmcgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/cgi/kcmcgi/Makefile" ;;
+-  "kioslave/filter/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/filter/Makefile" ;;
+-  "kioslave/finger/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/finger/Makefile" ;;
+-  "kioslave/fish/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/fish/Makefile" ;;
+-  "kioslave/floppy/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/floppy/Makefile" ;;
+-  "kioslave/home/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/home/Makefile" ;;
+-  "kioslave/home/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/home/kdedmodule/Makefile" ;;
+-  "kioslave/info/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/info/Makefile" ;;
+-  "kioslave/ldap/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/ldap/Makefile" ;;
+-  "kioslave/mac/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/mac/Makefile" ;;
+-  "kioslave/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/man/Makefile" ;;
+-  "kioslave/media/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/Makefile" ;;
+-  "kioslave/media/kcmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/kcmodule/Makefile" ;;
+-  "kioslave/media/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/kfile-plugin/Makefile" ;;
+-  "kioslave/media/libmediacommon/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/libmediacommon/Makefile" ;;
+-  "kioslave/media/mediamanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mediamanager/Makefile" ;;
+-  "kioslave/media/medianotifier/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/medianotifier/Makefile" ;;
+-  "kioslave/media/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mimetypes/Makefile" ;;
+-  "kioslave/media/mounthelper/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/mounthelper/Makefile" ;;
+-  "kioslave/media/services/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/media/services/Makefile" ;;
+-  "kioslave/nfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/nfs/Makefile" ;;
+-  "kioslave/nntp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/nntp/Makefile" ;;
+-  "kioslave/pop3/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/pop3/Makefile" ;;
+-  "kioslave/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/remote/Makefile" ;;
+-  "kioslave/remote/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/remote/kdedmodule/Makefile" ;;
+-  "kioslave/settings/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/settings/Makefile" ;;
+-  "kioslave/sftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/sftp/Makefile" ;;
+-  "kioslave/smb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/smb/Makefile" ;;
+-  "kioslave/smtp/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/smtp/Makefile" ;;
+-  "kioslave/system/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/Makefile" ;;
+-  "kioslave/system/entries/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/entries/Makefile" ;;
+-  "kioslave/system/kdedmodule/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/kdedmodule/Makefile" ;;
+-  "kioslave/system/mimetypes/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/system/mimetypes/Makefile" ;;
+-  "kioslave/tar/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/tar/Makefile" ;;
+-  "kioslave/thumbnail/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/thumbnail/Makefile" ;;
+-  "kioslave/trash/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/trash/Makefile" ;;
+-  "kioslave/trash/kfile-plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kioslave/trash/kfile-plugin/Makefile" ;;
+-  "klipper/Makefile" ) CONFIG_FILES="$CONFIG_FILES klipper/Makefile" ;;
+-  "kmenuedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmenuedit/Makefile" ;;
+-  "kmenuedit/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES kmenuedit/pixmaps/Makefile" ;;
+-  "knetattach/Makefile" ) CONFIG_FILES="$CONFIG_FILES knetattach/Makefile" ;;
+-  "konqueror/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/Makefile" ;;
+-  "konqueror/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/about/Makefile" ;;
+-  "konqueror/client/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/client/Makefile" ;;
+-  "konqueror/iconview/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/iconview/Makefile" ;;
+-  "konqueror/keditbookmarks/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/keditbookmarks/Makefile" ;;
+-  "konqueror/kttsplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/kttsplugin/Makefile" ;;
+-  "konqueror/listview/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/listview/Makefile" ;;
+-  "konqueror/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/Makefile" ;;
+-  "konqueror/pics/actions/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/actions/Makefile" ;;
+-  "konqueror/pics/indicators/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/indicators/Makefile" ;;
+-  "konqueror/pics/tiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/pics/tiles/Makefile" ;;
+-  "konqueror/preloader/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/preloader/Makefile" ;;
+-  "konqueror/quickprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/quickprint/Makefile" ;;
+-  "konqueror/remoteencodingplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/remoteencodingplugin/Makefile" ;;
+-  "konqueror/shellcmdplugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/shellcmdplugin/Makefile" ;;
+-  "konqueror/sidebar/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/Makefile" ;;
+-  "konqueror/sidebar/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/test/Makefile" ;;
+-  "konqueror/sidebar/trees/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/Makefile" ;;
+-  "konqueror/sidebar/trees/bookmark_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/bookmark_module/Makefile" ;;
+-  "konqueror/sidebar/trees/dirtree_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/dirtree_module/Makefile" ;;
+-  "konqueror/sidebar/trees/history_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/history_module/Makefile" ;;
+-  "konqueror/sidebar/trees/init/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/Makefile" ;;
+-  "konqueror/sidebar/trees/init/remote/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/Makefile" ;;
+-  "konqueror/sidebar/trees/init/remote/ftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/ftp/Makefile" ;;
+-  "konqueror/sidebar/trees/init/remote/web/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/web/Makefile" ;;
+-  "konqueror/sidebar/trees/init/services/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/services/Makefile" ;;
+-  "konqueror/sidebar/web_module/Makefile" ) CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/web_module/Makefile" ;;
+-  "konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/Makefile" ;;
+-  "konsole/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/doc/Makefile" ;;
+-  "konsole/doc/VT100/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/doc/VT100/Makefile" ;;
+-  "konsole/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/fonts/Makefile" ;;
+-  "konsole/konsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/konsole/Makefile" ;;
+-  "konsole/other/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/Makefile" ;;
+-  "konsole/other/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/icons/Makefile" ;;
+-  "konsole/other/wallpapers/Makefile" ) CONFIG_FILES="$CONFIG_FILES konsole/other/wallpapers/Makefile" ;;
+-  "kpager/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpager/Makefile" ;;
+-  "kpersonalizer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpersonalizer/Makefile" ;;
+-  "kpersonalizer/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpersonalizer/pics/Makefile" ;;
+-  "kreadconfig/Makefile" ) CONFIG_FILES="$CONFIG_FILES kreadconfig/Makefile" ;;
+-  "kscreensaver/Makefile" ) CONFIG_FILES="$CONFIG_FILES kscreensaver/Makefile" ;;
+-  "ksmserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksmserver/Makefile" ;;
+-  "ksplashml/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/Makefile" ;;
+-  "ksplashml/kcmksplash/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/Makefile" ;;
+-  "ksplashml/kcmksplash/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/pics/Makefile" ;;
+-  "ksplashml/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/Makefile" ;;
+-  "ksplashml/pics/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/Makefile" ;;
+-  "ksplashml/pics/themes/blue-bend/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/blue-bend/Makefile" ;;
+-  "ksplashml/pics/themes/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/Makefile" ;;
+-  "ksplashml/pics/themes/default/locolor/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/locolor/Makefile" ;;
+-  "ksplashml/pics/themes/none/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/none/Makefile" ;;
+-  "ksplashml/pics/themes/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/simple/Makefile" ;;
+-  "ksplashml/themeengine/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/Makefile" ;;
+-  "ksplashml/themeengine/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/default/Makefile" ;;
+-  "ksplashml/themeengine/redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/Makefile" ;;
+-  "ksplashml/themeengine/redmond/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/pics/Makefile" ;;
+-  "ksplashml/themeengine/simple/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/simple/Makefile" ;;
+-  "ksplashml/themeengine/standard/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/Makefile" ;;
+-  "ksplashml/themeengine/standard/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/pics/Makefile" ;;
+-  "kstart/Makefile" ) CONFIG_FILES="$CONFIG_FILES kstart/Makefile" ;;
+-  "ksysguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/Makefile" ;;
+-  "ksysguard/CContLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/CContLib/Makefile" ;;
+-  "ksysguard/example/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/example/Makefile" ;;
+-  "ksysguard/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/Makefile" ;;
+-  "ksysguard/gui/SensorDisplayLib/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/SensorDisplayLib/Makefile" ;;
+-  "ksysguard/gui/ksgrd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/gui/ksgrd/Makefile" ;;
+-  "ksysguard/ksysguardd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Makefile" ;;
+-  "ksysguard/ksysguardd/FreeBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/FreeBSD/Makefile" ;;
+-  "ksysguard/ksysguardd/Irix/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Irix/Makefile" ;;
+-  "ksysguard/ksysguardd/Linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Linux/Makefile" ;;
+-  "ksysguard/ksysguardd/NetBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/NetBSD/Makefile" ;;
+-  "ksysguard/ksysguardd/OpenBSD/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/OpenBSD/Makefile" ;;
+-  "ksysguard/ksysguardd/Solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Solaris/Makefile" ;;
+-  "ksysguard/ksysguardd/Tru64/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Tru64/Makefile" ;;
+-  "ksysguard/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksysguard/pics/Makefile" ;;
+-  "ksystraycmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ksystraycmd/Makefile" ;;
+-  "ktip/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktip/Makefile" ;;
+-  "ktip/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES ktip/pics/Makefile" ;;
+-  "kwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/Makefile" ;;
+-  "kwin/clients/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/Makefile" ;;
+-  "kwin/clients/b2/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/Makefile" ;;
+-  "kwin/clients/b2/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/config/Makefile" ;;
+-  "kwin/clients/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/default/Makefile" ;;
+-  "kwin/clients/default/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/default/config/Makefile" ;;
+-  "kwin/clients/keramik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/Makefile" ;;
+-  "kwin/clients/keramik/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/config/Makefile" ;;
+-  "kwin/clients/kwmtheme/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/Makefile" ;;
+-  "kwin/clients/kwmtheme/cli_installer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/cli_installer/Makefile" ;;
+-  "kwin/clients/laptop/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/laptop/Makefile" ;;
+-  "kwin/clients/modernsystem/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/Makefile" ;;
+-  "kwin/clients/modernsystem/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/config/Makefile" ;;
+-  "kwin/clients/plastik/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/Makefile" ;;
+-  "kwin/clients/plastik/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/config/Makefile" ;;
+-  "kwin/clients/quartz/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/Makefile" ;;
+-  "kwin/clients/quartz/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/config/Makefile" ;;
+-  "kwin/clients/redmond/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/redmond/Makefile" ;;
+-  "kwin/clients/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/test/Makefile" ;;
+-  "kwin/clients/web/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/clients/web/Makefile" ;;
+-  "kwin/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/data/Makefile" ;;
+-  "kwin/kcmkwin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/Makefile" ;;
+-  "kwin/kcmkwin/kwindecoration/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwindecoration/Makefile" ;;
+-  "kwin/kcmkwin/kwinoptions/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinoptions/Makefile" ;;
+-  "kwin/kcmkwin/kwinrules/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinrules/Makefile" ;;
+-  "kwin/killer/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/killer/Makefile" ;;
+-  "kwin/kompmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/kompmgr/Makefile" ;;
+-  "kwin/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/lib/Makefile" ;;
+-  "kwin/oldheaders/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/oldheaders/Makefile" ;;
+-  "kwin/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/pics/Makefile" ;;
+-  "kwin/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/tools/Makefile" ;;
+-  "kwin/tools/decobenchmark/Makefile" ) CONFIG_FILES="$CONFIG_FILES kwin/tools/decobenchmark/Makefile" ;;
+-  "kxkb/Makefile" ) CONFIG_FILES="$CONFIG_FILES kxkb/Makefile" ;;
+-  "kxkb/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kxkb/pics/Makefile" ;;
+-  "l10n/Makefile" ) CONFIG_FILES="$CONFIG_FILES l10n/Makefile" ;;
+-  "libkonq/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/Makefile" ;;
+-  "libkonq/favicons/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/favicons/Makefile" ;;
+-  "libkonq/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/pics/Makefile" ;;
+-  "libkonq/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES libkonq/tests/Makefile" ;;
+-  "nsplugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/Makefile" ;;
+-  "nsplugins/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/test/Makefile" ;;
+-  "nsplugins/viewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/viewer/Makefile" ;;
+-  "nsplugins/wrapper/Makefile" ) CONFIG_FILES="$CONFIG_FILES nsplugins/wrapper/Makefile" ;;
+-  "pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;;
+-  "pics/crystalsvg/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;;
+-  "pics/wallpapers/Makefile" ) CONFIG_FILES="$CONFIG_FILES pics/wallpapers/Makefile" ;;
+-  "kdm/kfrontend/sessions/kde.desktop" ) CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/kde.desktop" ;;
+-  "khelpcenter/searchhandlers/khc_docbookdig.pl" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_docbookdig.pl" ;;
+-  "khelpcenter/searchhandlers/khc_htdig.pl" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_htdig.pl" ;;
+-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++  case $ac_config_target in
++    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++    "applnk/Makefile") CONFIG_FILES="$CONFIG_FILES applnk/Makefile" ;;
++    "applnk/compat/Makefile") CONFIG_FILES="$CONFIG_FILES applnk/compat/Makefile" ;;
++    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++    "doc/faq/Makefile") CONFIG_FILES="$CONFIG_FILES doc/faq/Makefile" ;;
++    "doc/glossary/Makefile") CONFIG_FILES="$CONFIG_FILES doc/glossary/Makefile" ;;
++    "doc/kappfinder/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kappfinder/Makefile" ;;
++    "doc/kate/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kate/Makefile" ;;
++    "doc/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/Makefile" ;;
++    "doc/kcontrol/arts/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/arts/Makefile" ;;
++    "doc/kcontrol/background/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/background/Makefile" ;;
++    "doc/kcontrol/bell/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/bell/Makefile" ;;
++    "doc/kcontrol/cache/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cache/Makefile" ;;
++    "doc/kcontrol/clock/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/clock/Makefile" ;;
++    "doc/kcontrol/colors/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/colors/Makefile" ;;
++    "doc/kcontrol/cookies/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/cookies/Makefile" ;;
++    "doc/kcontrol/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/crypto/Makefile" ;;
++    "doc/kcontrol/desktop/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktop/Makefile" ;;
++    "doc/kcontrol/desktopbehavior/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/desktopbehavior/Makefile" ;;
++    "doc/kcontrol/ebrowsing/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/ebrowsing/Makefile" ;;
++    "doc/kcontrol/email/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/email/Makefile" ;;
++    "doc/kcontrol/energy/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/energy/Makefile" ;;
++    "doc/kcontrol/filemanager/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filemanager/Makefile" ;;
++    "doc/kcontrol/filetypes/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/filetypes/Makefile" ;;
++    "doc/kcontrol/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/fonts/Makefile" ;;
++    "doc/kcontrol/helpindex/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/helpindex/Makefile" ;;
++    "doc/kcontrol/icons/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/icons/Makefile" ;;
++    "doc/kcontrol/kcmaccess/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmaccess/Makefile" ;;
++    "doc/kcontrol/kcmcss/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmcss/Makefile" ;;
++    "doc/kcontrol/kcmfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmfontinst/Makefile" ;;
++    "doc/kcontrol/kcmkonsole/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmkonsole/Makefile" ;;
++    "doc/kcontrol/kcmlaunch/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmlaunch/Makefile" ;;
++    "doc/kcontrol/kcmnotify/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmnotify/Makefile" ;;
++    "doc/kcontrol/kcmsmserver/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmsmserver/Makefile" ;;
++    "doc/kcontrol/kcmstyle/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmstyle/Makefile" ;;
++    "doc/kcontrol/kcmtaskbar/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kcmtaskbar/Makefile" ;;
++    "doc/kcontrol/kdm/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kdm/Makefile" ;;
++    "doc/kcontrol/keyboard/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keyboard/Makefile" ;;
++    "doc/kcontrol/keys/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/keys/Makefile" ;;
++    "doc/kcontrol/khtml/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/khtml/Makefile" ;;
++    "doc/kcontrol/kwindecoration/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/kwindecoration/Makefile" ;;
++    "doc/kcontrol/language/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/language/Makefile" ;;
++    "doc/kcontrol/mouse/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/mouse/Makefile" ;;
++    "doc/kcontrol/netpref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/netpref/Makefile" ;;
++    "doc/kcontrol/panel/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panel/Makefile" ;;
++    "doc/kcontrol/panelappearance/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/panelappearance/Makefile" ;;
++    "doc/kcontrol/passwords/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/passwords/Makefile" ;;
++    "doc/kcontrol/performance/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/performance/Makefile" ;;
++    "doc/kcontrol/proxy/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/proxy/Makefile" ;;
++    "doc/kcontrol/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/screensaver/Makefile" ;;
++    "doc/kcontrol/smb/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/smb/Makefile" ;;
++    "doc/kcontrol/spellchecking/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/spellchecking/Makefile" ;;
++    "doc/kcontrol/useragent/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/useragent/Makefile" ;;
++    "doc/kcontrol/windowmanagement/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kcontrol/windowmanagement/Makefile" ;;
++    "doc/kdcop/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdcop/Makefile" ;;
++    "doc/kdebugdialog/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdebugdialog/Makefile" ;;
++    "doc/kdeprint/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdeprint/Makefile" ;;
++    "doc/kdesu/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdesu/Makefile" ;;
++    "doc/kdm/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kdm/Makefile" ;;
++    "doc/kfind/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kfind/Makefile" ;;
++    "doc/khelpcenter/Makefile") CONFIG_FILES="$CONFIG_FILES doc/khelpcenter/Makefile" ;;
++    "doc/kicker/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kicker/Makefile" ;;
++    "doc/kinfocenter/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/Makefile" ;;
++    "doc/kinfocenter/devices/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/devices/Makefile" ;;
++    "doc/kinfocenter/dma/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/dma/Makefile" ;;
++    "doc/kinfocenter/interrupts/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/interrupts/Makefile" ;;
++    "doc/kinfocenter/ioports/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/ioports/Makefile" ;;
++    "doc/kinfocenter/memory/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/memory/Makefile" ;;
++    "doc/kinfocenter/nics/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/nics/Makefile" ;;
++    "doc/kinfocenter/opengl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/opengl/Makefile" ;;
++    "doc/kinfocenter/partitions/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/partitions/Makefile" ;;
++    "doc/kinfocenter/pci/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pci/Makefile" ;;
++    "doc/kinfocenter/pcmcia/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/pcmcia/Makefile" ;;
++    "doc/kinfocenter/processor/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/processor/Makefile" ;;
++    "doc/kinfocenter/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/protocols/Makefile" ;;
++    "doc/kinfocenter/samba/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/samba/Makefile" ;;
++    "doc/kinfocenter/scsi/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/scsi/Makefile" ;;
++    "doc/kinfocenter/sound/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/sound/Makefile" ;;
++    "doc/kinfocenter/usb/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/usb/Makefile" ;;
++    "doc/kinfocenter/xserver/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kinfocenter/xserver/Makefile" ;;
++    "doc/kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kioslave/Makefile" ;;
++    "doc/klipper/Makefile") CONFIG_FILES="$CONFIG_FILES doc/klipper/Makefile" ;;
++    "doc/kmenuedit/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kmenuedit/Makefile" ;;
++    "doc/knetattach/Makefile") CONFIG_FILES="$CONFIG_FILES doc/knetattach/Makefile" ;;
++    "doc/kompmgr/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kompmgr/Makefile" ;;
++    "doc/konqueror/Makefile") CONFIG_FILES="$CONFIG_FILES doc/konqueror/Makefile" ;;
++    "doc/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES doc/konsole/Makefile" ;;
++    "doc/kpager/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kpager/Makefile" ;;
++    "doc/ksplashml/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ksplashml/Makefile" ;;
++    "doc/ksysguard/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ksysguard/Makefile" ;;
++    "doc/kwrite/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kwrite/Makefile" ;;
++    "doc/kxkb/Makefile") CONFIG_FILES="$CONFIG_FILES doc/kxkb/Makefile" ;;
++    "doc/quickstart/Makefile") CONFIG_FILES="$CONFIG_FILES doc/quickstart/Makefile" ;;
++    "doc/userguide/Makefile") CONFIG_FILES="$CONFIG_FILES doc/userguide/Makefile" ;;
++    "doc/visualdict/Makefile") CONFIG_FILES="$CONFIG_FILES doc/visualdict/Makefile" ;;
++    "drkonqi/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/Makefile" ;;
++    "drkonqi/debuggers/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/debuggers/Makefile" ;;
++    "drkonqi/pics/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/pics/Makefile" ;;
++    "drkonqi/presets/Makefile") CONFIG_FILES="$CONFIG_FILES drkonqi/presets/Makefile" ;;
++    "kappfinder/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/Makefile" ;;
++    "kappfinder/apps/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Makefile" ;;
++    "kappfinder/apps/Development/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Development/Makefile" ;;
++    "kappfinder/apps/Games/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Makefile" ;;
++    "kappfinder/apps/Games/Arcade/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Arcade/Makefile" ;;
++    "kappfinder/apps/Games/Board/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Board/Makefile" ;;
++    "kappfinder/apps/Games/Card/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Card/Makefile" ;;
++    "kappfinder/apps/Games/Emulators/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Emulators/Makefile" ;;
++    "kappfinder/apps/Games/Roguelikes/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Roguelikes/Makefile" ;;
++    "kappfinder/apps/Games/TacticStrategy/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/TacticStrategy/Makefile" ;;
++    "kappfinder/apps/Games/Toys/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Games/Toys/Makefile" ;;
++    "kappfinder/apps/Graphics/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Graphics/Makefile" ;;
++    "kappfinder/apps/Internet/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Makefile" ;;
++    "kappfinder/apps/Internet/Terminal/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Internet/Terminal/Makefile" ;;
++    "kappfinder/apps/Multimedia/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Multimedia/Makefile" ;;
++    "kappfinder/apps/Office/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Office/Makefile" ;;
++    "kappfinder/apps/System/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Makefile" ;;
++    "kappfinder/apps/System/Terminal/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/System/Terminal/Makefile" ;;
++    "kappfinder/apps/Utilities/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Makefile" ;;
++    "kappfinder/apps/Utilities/Editors/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/Editors/Makefile" ;;
++    "kappfinder/apps/Utilities/xutils/Makefile") CONFIG_FILES="$CONFIG_FILES kappfinder/apps/Utilities/xutils/Makefile" ;;
++    "kate/Makefile") CONFIG_FILES="$CONFIG_FILES kate/Makefile" ;;
++    "kate/app/Makefile") CONFIG_FILES="$CONFIG_FILES kate/app/Makefile" ;;
++    "kate/data/Makefile") CONFIG_FILES="$CONFIG_FILES kate/data/Makefile" ;;
++    "kate/interfaces/Makefile") CONFIG_FILES="$CONFIG_FILES kate/interfaces/Makefile" ;;
++    "kate/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kate/pics/Makefile" ;;
++    "kate/pics/actions/Makefile") CONFIG_FILES="$CONFIG_FILES kate/pics/actions/Makefile" ;;
++    "kate/utils/Makefile") CONFIG_FILES="$CONFIG_FILES kate/utils/Makefile" ;;
++    "kcheckpass/Makefile") CONFIG_FILES="$CONFIG_FILES kcheckpass/Makefile" ;;
++    "kcminit/Makefile") CONFIG_FILES="$CONFIG_FILES kcminit/Makefile" ;;
++    "kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/Makefile" ;;
++    "kcontrol/access/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/access/Makefile" ;;
++    "kcontrol/accessibility/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/accessibility/Makefile" ;;
++    "kcontrol/arts/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/arts/Makefile" ;;
++    "kcontrol/background/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/background/Makefile" ;;
++    "kcontrol/background/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/background/pics/Makefile" ;;
++    "kcontrol/bell/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/bell/Makefile" ;;
++    "kcontrol/clock/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/clock/Makefile" ;;
++    "kcontrol/colors/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/colors/Makefile" ;;
++    "kcontrol/componentchooser/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/Makefile" ;;
++    "kcontrol/componentchooser/componentservices/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/componentchooser/componentservices/Makefile" ;;
++    "kcontrol/crypto/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/crypto/Makefile" ;;
++    "kcontrol/css/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/css/Makefile" ;;
++    "kcontrol/display/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/display/Makefile" ;;
++    "kcontrol/dnssd/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/dnssd/Makefile" ;;
++    "kcontrol/ebrowsing/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/Makefile" ;;
++    "kcontrol/ebrowsing/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/Makefile" ;;
++    "kcontrol/ebrowsing/plugins/ikws/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/Makefile" ;;
++    "kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile" ;;
++    "kcontrol/ebrowsing/plugins/localdomain/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/localdomain/Makefile" ;;
++    "kcontrol/ebrowsing/plugins/shorturi/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ebrowsing/plugins/shorturi/Makefile" ;;
++    "kcontrol/energy/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/energy/Makefile" ;;
++    "kcontrol/energy/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/energy/pics/Makefile" ;;
++    "kcontrol/filetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/filetypes/Makefile" ;;
++    "kcontrol/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/fonts/Makefile" ;;
++    "kcontrol/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/icons/Makefile" ;;
++    "kcontrol/info/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/info/Makefile" ;;
++    "kcontrol/input/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/Makefile" ;;
++    "kcontrol/input/core/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/core/Makefile" ;;
++    "kcontrol/input/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/pics/Makefile" ;;
++    "kcontrol/input/xcursor/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/input/xcursor/Makefile" ;;
++    "kcontrol/ioslaveinfo/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/ioslaveinfo/Makefile" ;;
++    "kcontrol/joystick/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/joystick/Makefile" ;;
++    "kcontrol/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/Makefile" ;;
++    "kcontrol/kcontrol/about/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kcontrol/about/Makefile" ;;
++    "kcontrol/kded/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kded/Makefile" ;;
++    "kcontrol/kdm/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kdm/Makefile" ;;
++    "kcontrol/keys/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/keys/Makefile" ;;
++    "kcontrol/kfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/Makefile" ;;
++    "kcontrol/kfontinst/kcmfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kcmfontinst/Makefile" ;;
++    "kcontrol/kfontinst/kfile-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfile-plugin/Makefile" ;;
++    "kcontrol/kfontinst/kfontinst/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kfontinst/Makefile" ;;
++    "kcontrol/kfontinst/kio/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/kio/Makefile" ;;
++    "kcontrol/kfontinst/lib/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/lib/Makefile" ;;
++    "kcontrol/kfontinst/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/thumbnail/Makefile" ;;
++    "kcontrol/kfontinst/viewpart/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kfontinst/viewpart/Makefile" ;;
++    "kcontrol/kicker/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kicker/Makefile" ;;
++    "kcontrol/kio/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kio/Makefile" ;;
++    "kcontrol/kio/uasproviders/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kio/uasproviders/Makefile" ;;
++    "kcontrol/knotify/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/Makefile" ;;
++    "kcontrol/knotify/sounds/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/knotify/sounds/Makefile" ;;
++    "kcontrol/konq/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/konq/Makefile" ;;
++    "kcontrol/konqhtml/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/konqhtml/Makefile" ;;
++    "kcontrol/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/konsole/Makefile" ;;
++    "kcontrol/krdb/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/Makefile" ;;
++    "kcontrol/krdb/ad/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/ad/Makefile" ;;
++    "kcontrol/krdb/kcs/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/kcs/Makefile" ;;
++    "kcontrol/krdb/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/pics/Makefile" ;;
++    "kcontrol/krdb/themes/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Makefile" ;;
++    "kcontrol/krdb/themes/HighContrastDark/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark/Makefile" ;;
++    "kcontrol/krdb/themes/HighContrastDark-big/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastDark-big/Makefile" ;;
++    "kcontrol/krdb/themes/HighContrastLight/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight/Makefile" ;;
++    "kcontrol/krdb/themes/HighContrastLight-big/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/HighContrastLight-big/Makefile" ;;
++    "kcontrol/krdb/themes/KDE_Classic/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/KDE_Classic/Makefile" ;;
++    "kcontrol/krdb/themes/Keramik/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Keramik/Makefile" ;;
++    "kcontrol/krdb/themes/Plastik/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Plastik/Makefile" ;;
++    "kcontrol/krdb/themes/Platinum/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Platinum/Makefile" ;;
++    "kcontrol/krdb/themes/Redmond/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Redmond/Makefile" ;;
++    "kcontrol/krdb/themes/Sunshine/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/Sunshine/Makefile" ;;
++    "kcontrol/krdb/themes/YellowOnBlue/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue/Makefile" ;;
++    "kcontrol/krdb/themes/YellowOnBlue-big/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/krdb/themes/YellowOnBlue-big/Makefile" ;;
++    "kcontrol/kthememanager/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/kthememanager/Makefile" ;;
++    "kcontrol/launch/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/launch/Makefile" ;;
++    "kcontrol/locale/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/locale/Makefile" ;;
++    "kcontrol/locale/default/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/locale/default/Makefile" ;;
++    "kcontrol/locale/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/locale/pics/Makefile" ;;
++    "kcontrol/nics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/nics/Makefile" ;;
++    "kcontrol/performance/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/performance/Makefile" ;;
++    "kcontrol/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/pics/Makefile" ;;
++    "kcontrol/privacy/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/privacy/Makefile" ;;
++    "kcontrol/randr/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/randr/Makefile" ;;
++    "kcontrol/samba/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/samba/Makefile" ;;
++    "kcontrol/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/screensaver/Makefile" ;;
++    "kcontrol/smartcard/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/smartcard/Makefile" ;;
++    "kcontrol/smserver/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/smserver/Makefile" ;;
++    "kcontrol/spellchecking/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/spellchecking/Makefile" ;;
++    "kcontrol/style/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/style/Makefile" ;;
++    "kcontrol/style/keramik/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/style/keramik/Makefile" ;;
++    "kcontrol/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/taskbar/Makefile" ;;
++    "kcontrol/usbview/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/usbview/Makefile" ;;
++    "kcontrol/view1394/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/view1394/Makefile" ;;
++    "kcontrol/xinerama/Makefile") CONFIG_FILES="$CONFIG_FILES kcontrol/xinerama/Makefile" ;;
++    "kdcop/Makefile") CONFIG_FILES="$CONFIG_FILES kdcop/Makefile" ;;
++    "kdebugdialog/Makefile") CONFIG_FILES="$CONFIG_FILES kdebugdialog/Makefile" ;;
++    "kdeeject/Makefile") CONFIG_FILES="$CONFIG_FILES kdeeject/Makefile" ;;
++    "kdepasswd/Makefile") CONFIG_FILES="$CONFIG_FILES kdepasswd/Makefile" ;;
++    "kdepasswd/kcm/Makefile") CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/Makefile" ;;
++    "kdepasswd/kcm/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kdepasswd/kcm/pics/Makefile" ;;
++    "kdeprint/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/Makefile" ;;
++    "kdeprint/descriptions/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/descriptions/Makefile" ;;
++    "kdeprint/kdeprint_part/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprint_part/Makefile" ;;
++    "kdeprint/kdeprintfax/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kdeprintfax/Makefile" ;;
++    "kdeprint/kjobviewer/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kjobviewer/Makefile" ;;
++    "kdeprint/kprinter/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/kprinter/Makefile" ;;
++    "kdeprint/printmgr/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/printmgr/Makefile" ;;
++    "kdeprint/slave/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/slave/Makefile" ;;
++    "kdeprint/slave/mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/slave/mimetypes/Makefile" ;;
++    "kdeprint/slave/templates/Makefile") CONFIG_FILES="$CONFIG_FILES kdeprint/slave/templates/Makefile" ;;
++    "kdesktop/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/Makefile" ;;
++    "kdesktop/init/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/init/Makefile" ;;
++    "kdesktop/init/Templates/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/init/Templates/Makefile" ;;
++    "kdesktop/kwebdesktop/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/kwebdesktop/Makefile" ;;
++    "kdesktop/lock/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/lock/Makefile" ;;
++    "kdesktop/patterns/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/patterns/Makefile" ;;
++    "kdesktop/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/pics/Makefile" ;;
++    "kdesktop/programs/Makefile") CONFIG_FILES="$CONFIG_FILES kdesktop/programs/Makefile" ;;
++    "kdesu/Makefile") CONFIG_FILES="$CONFIG_FILES kdesu/Makefile" ;;
++    "kdesu/kdesu/Makefile") CONFIG_FILES="$CONFIG_FILES kdesu/kdesu/Makefile" ;;
++    "kdesu/kdesud/Makefile") CONFIG_FILES="$CONFIG_FILES kdesu/kdesud/Makefile" ;;
++    "kdialog/Makefile") CONFIG_FILES="$CONFIG_FILES kdialog/Makefile" ;;
++    "kdm/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/Makefile" ;;
++    "kdm/backend/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/backend/Makefile" ;;
++    "kdm/kfrontend/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/Makefile" ;;
++    "kdm/kfrontend/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/pics/Makefile" ;;
++    "kdm/kfrontend/sessions/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/Makefile" ;;
++    "kdm/kfrontend/themer/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themer/Makefile" ;;
++    "kdm/kfrontend/themes/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/Makefile" ;;
++    "kdm/kfrontend/themes/circles/Makefile") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/themes/circles/Makefile" ;;
++    "kdmlib/Makefile") CONFIG_FILES="$CONFIG_FILES kdmlib/Makefile" ;;
++    "kfind/Makefile") CONFIG_FILES="$CONFIG_FILES kfind/Makefile" ;;
++    "kfind/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kfind/pics/Makefile" ;;
++    "khelpcenter/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/Makefile" ;;
++    "khelpcenter/htmlsearch/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/htmlsearch/Makefile" ;;
++    "khelpcenter/pics/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/pics/Makefile" ;;
++    "khelpcenter/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Makefile" ;;
++    "khelpcenter/plugins/Applications/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Applications/Makefile" ;;
++    "khelpcenter/plugins/Manpages/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Manpages/Makefile" ;;
++    "khelpcenter/plugins/Scrollkeeper/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Scrollkeeper/Makefile" ;;
++    "khelpcenter/plugins/Tutorials/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/plugins/Tutorials/Makefile" ;;
++    "khelpcenter/searchhandlers/Makefile") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/Makefile" ;;
++    "khotkeys/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/Makefile" ;;
++    "khotkeys/app/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/app/Makefile" ;;
++    "khotkeys/arts/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/arts/Makefile" ;;
++    "khotkeys/data/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/data/Makefile" ;;
++    "khotkeys/kcontrol/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/Makefile" ;;
++    "khotkeys/kcontrol/ui/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/ui/Makefile" ;;
++    "khotkeys/shared/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/shared/Makefile" ;;
++    "khotkeys/update/Makefile") CONFIG_FILES="$CONFIG_FILES khotkeys/update/Makefile" ;;
++    "kicker/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/Makefile" ;;
++    "kicker/applets/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/Makefile" ;;
++    "kicker/applets/clock/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/clock/Makefile" ;;
++    "kicker/applets/launcher/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/launcher/Makefile" ;;
++    "kicker/applets/lockout/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/lockout/Makefile" ;;
++    "kicker/applets/media/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/media/Makefile" ;;
++    "kicker/applets/menu/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/menu/Makefile" ;;
++    "kicker/applets/minipager/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/minipager/Makefile" ;;
++    "kicker/applets/naughty/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/naughty/Makefile" ;;
++    "kicker/applets/run/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/run/Makefile" ;;
++    "kicker/applets/swallow/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/swallow/Makefile" ;;
++    "kicker/applets/systemtray/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/systemtray/Makefile" ;;
++    "kicker/applets/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/taskbar/Makefile" ;;
++    "kicker/applets/trash/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/applets/trash/Makefile" ;;
++    "kicker/data/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/Makefile" ;;
++    "kicker/data/app_start_anim/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/app_start_anim/Makefile" ;;
++    "kicker/data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/icons/Makefile" ;;
++    "kicker/data/icons/actions/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/icons/actions/Makefile" ;;
++    "kicker/data/kmenu_side/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/kmenu_side/Makefile" ;;
++    "kicker/data/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/tiles/Makefile" ;;
++    "kicker/data/wallpaper/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/data/wallpaper/Makefile" ;;
++    "kicker/extensions/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/Makefile" ;;
++    "kicker/extensions/dockbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/dockbar/Makefile" ;;
++    "kicker/extensions/kasbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/kasbar/Makefile" ;;
++    "kicker/extensions/sidebar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/sidebar/Makefile" ;;
++    "kicker/extensions/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/extensions/taskbar/Makefile" ;;
++    "kicker/kicker/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/Makefile" ;;
++    "kicker/kicker/buttons/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/buttons/Makefile" ;;
++    "kicker/kicker/core/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/core/Makefile" ;;
++    "kicker/kicker/ui/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/kicker/ui/Makefile" ;;
++    "kicker/libkicker/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/libkicker/Makefile" ;;
++    "kicker/menuext/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/Makefile" ;;
++    "kicker/menuext/find/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/find/Makefile" ;;
++    "kicker/menuext/kdeprint/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/kdeprint/Makefile" ;;
++    "kicker/menuext/konq-profiles/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/konq-profiles/Makefile" ;;
++    "kicker/menuext/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/konsole/Makefile" ;;
++    "kicker/menuext/prefmenu/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/prefmenu/Makefile" ;;
++    "kicker/menuext/recentdocs/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/recentdocs/Makefile" ;;
++    "kicker/menuext/remote/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/remote/Makefile" ;;
++    "kicker/menuext/system/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/system/Makefile" ;;
++    "kicker/menuext/tom/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/menuext/tom/Makefile" ;;
++    "kicker/proxy/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/proxy/Makefile" ;;
++    "kicker/taskbar/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/taskbar/Makefile" ;;
++    "kicker/taskmanager/Makefile") CONFIG_FILES="$CONFIG_FILES kicker/taskmanager/Makefile" ;;
++    "kioslave/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/Makefile" ;;
++    "kioslave/about/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/about/Makefile" ;;
++    "kioslave/cgi/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/cgi/Makefile" ;;
++    "kioslave/cgi/kcmcgi/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/cgi/kcmcgi/Makefile" ;;
++    "kioslave/filter/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/filter/Makefile" ;;
++    "kioslave/finger/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/finger/Makefile" ;;
++    "kioslave/fish/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/fish/Makefile" ;;
++    "kioslave/floppy/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/floppy/Makefile" ;;
++    "kioslave/home/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/home/Makefile" ;;
++    "kioslave/home/kdedmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/home/kdedmodule/Makefile" ;;
++    "kioslave/info/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/info/Makefile" ;;
++    "kioslave/ldap/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/ldap/Makefile" ;;
++    "kioslave/mac/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/mac/Makefile" ;;
++    "kioslave/man/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/man/Makefile" ;;
++    "kioslave/media/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/Makefile" ;;
++    "kioslave/media/kcmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/kcmodule/Makefile" ;;
++    "kioslave/media/kfile-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/kfile-plugin/Makefile" ;;
++    "kioslave/media/libmediacommon/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/libmediacommon/Makefile" ;;
++    "kioslave/media/mediamanager/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/mediamanager/Makefile" ;;
++    "kioslave/media/medianotifier/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/medianotifier/Makefile" ;;
++    "kioslave/media/mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/mimetypes/Makefile" ;;
++    "kioslave/media/mounthelper/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/mounthelper/Makefile" ;;
++    "kioslave/media/services/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/media/services/Makefile" ;;
++    "kioslave/nfs/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/nfs/Makefile" ;;
++    "kioslave/nntp/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/nntp/Makefile" ;;
++    "kioslave/pop3/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/pop3/Makefile" ;;
++    "kioslave/remote/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/remote/Makefile" ;;
++    "kioslave/remote/kdedmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/remote/kdedmodule/Makefile" ;;
++    "kioslave/settings/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/settings/Makefile" ;;
++    "kioslave/sftp/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/sftp/Makefile" ;;
++    "kioslave/smb/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/smb/Makefile" ;;
++    "kioslave/smtp/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/smtp/Makefile" ;;
++    "kioslave/system/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/Makefile" ;;
++    "kioslave/system/entries/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/entries/Makefile" ;;
++    "kioslave/system/kdedmodule/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/kdedmodule/Makefile" ;;
++    "kioslave/system/mimetypes/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/system/mimetypes/Makefile" ;;
++    "kioslave/tar/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/tar/Makefile" ;;
++    "kioslave/thumbnail/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/thumbnail/Makefile" ;;
++    "kioslave/trash/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/trash/Makefile" ;;
++    "kioslave/trash/kfile-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES kioslave/trash/kfile-plugin/Makefile" ;;
++    "klipper/Makefile") CONFIG_FILES="$CONFIG_FILES klipper/Makefile" ;;
++    "kmenuedit/Makefile") CONFIG_FILES="$CONFIG_FILES kmenuedit/Makefile" ;;
++    "kmenuedit/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES kmenuedit/pixmaps/Makefile" ;;
++    "knetattach/Makefile") CONFIG_FILES="$CONFIG_FILES knetattach/Makefile" ;;
++    "konqueror/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/Makefile" ;;
++    "konqueror/about/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/about/Makefile" ;;
++    "konqueror/client/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/client/Makefile" ;;
++    "konqueror/iconview/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/iconview/Makefile" ;;
++    "konqueror/keditbookmarks/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/keditbookmarks/Makefile" ;;
++    "konqueror/kttsplugin/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/kttsplugin/Makefile" ;;
++    "konqueror/listview/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/listview/Makefile" ;;
++    "konqueror/pics/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/Makefile" ;;
++    "konqueror/pics/actions/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/actions/Makefile" ;;
++    "konqueror/pics/indicators/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/indicators/Makefile" ;;
++    "konqueror/pics/tiles/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/pics/tiles/Makefile" ;;
++    "konqueror/preloader/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/preloader/Makefile" ;;
++    "konqueror/quickprint/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/quickprint/Makefile" ;;
++    "konqueror/remoteencodingplugin/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/remoteencodingplugin/Makefile" ;;
++    "konqueror/shellcmdplugin/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/shellcmdplugin/Makefile" ;;
++    "konqueror/sidebar/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/Makefile" ;;
++    "konqueror/sidebar/test/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/test/Makefile" ;;
++    "konqueror/sidebar/trees/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/Makefile" ;;
++    "konqueror/sidebar/trees/bookmark_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/bookmark_module/Makefile" ;;
++    "konqueror/sidebar/trees/dirtree_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/dirtree_module/Makefile" ;;
++    "konqueror/sidebar/trees/history_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/history_module/Makefile" ;;
++    "konqueror/sidebar/trees/init/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/Makefile" ;;
++    "konqueror/sidebar/trees/init/remote/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/Makefile" ;;
++    "konqueror/sidebar/trees/init/remote/ftp/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/ftp/Makefile" ;;
++    "konqueror/sidebar/trees/init/remote/web/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/remote/web/Makefile" ;;
++    "konqueror/sidebar/trees/init/services/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/trees/init/services/Makefile" ;;
++    "konqueror/sidebar/web_module/Makefile") CONFIG_FILES="$CONFIG_FILES konqueror/sidebar/web_module/Makefile" ;;
++    "konsole/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/Makefile" ;;
++    "konsole/doc/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/doc/Makefile" ;;
++    "konsole/doc/VT100/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/doc/VT100/Makefile" ;;
++    "konsole/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/fonts/Makefile" ;;
++    "konsole/konsole/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/konsole/Makefile" ;;
++    "konsole/other/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/other/Makefile" ;;
++    "konsole/other/icons/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/other/icons/Makefile" ;;
++    "konsole/other/wallpapers/Makefile") CONFIG_FILES="$CONFIG_FILES konsole/other/wallpapers/Makefile" ;;
++    "kpager/Makefile") CONFIG_FILES="$CONFIG_FILES kpager/Makefile" ;;
++    "kpersonalizer/Makefile") CONFIG_FILES="$CONFIG_FILES kpersonalizer/Makefile" ;;
++    "kpersonalizer/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kpersonalizer/pics/Makefile" ;;
++    "kreadconfig/Makefile") CONFIG_FILES="$CONFIG_FILES kreadconfig/Makefile" ;;
++    "kscreensaver/Makefile") CONFIG_FILES="$CONFIG_FILES kscreensaver/Makefile" ;;
++    "ksmserver/Makefile") CONFIG_FILES="$CONFIG_FILES ksmserver/Makefile" ;;
++    "ksplashml/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/Makefile" ;;
++    "ksplashml/kcmksplash/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/Makefile" ;;
++    "ksplashml/kcmksplash/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/kcmksplash/pics/Makefile" ;;
++    "ksplashml/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/Makefile" ;;
++    "ksplashml/pics/themes/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/Makefile" ;;
++    "ksplashml/pics/themes/blue-bend/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/blue-bend/Makefile" ;;
++    "ksplashml/pics/themes/default/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/Makefile" ;;
++    "ksplashml/pics/themes/default/locolor/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/default/locolor/Makefile" ;;
++    "ksplashml/pics/themes/none/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/none/Makefile" ;;
++    "ksplashml/pics/themes/simple/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/pics/themes/simple/Makefile" ;;
++    "ksplashml/themeengine/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/Makefile" ;;
++    "ksplashml/themeengine/default/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/default/Makefile" ;;
++    "ksplashml/themeengine/redmond/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/Makefile" ;;
++    "ksplashml/themeengine/redmond/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/redmond/pics/Makefile" ;;
++    "ksplashml/themeengine/simple/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/simple/Makefile" ;;
++    "ksplashml/themeengine/standard/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/Makefile" ;;
++    "ksplashml/themeengine/standard/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksplashml/themeengine/standard/pics/Makefile" ;;
++    "kstart/Makefile") CONFIG_FILES="$CONFIG_FILES kstart/Makefile" ;;
++    "ksysguard/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/Makefile" ;;
++    "ksysguard/CContLib/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/CContLib/Makefile" ;;
++    "ksysguard/example/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/example/Makefile" ;;
++    "ksysguard/gui/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/gui/Makefile" ;;
++    "ksysguard/gui/SensorDisplayLib/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/gui/SensorDisplayLib/Makefile" ;;
++    "ksysguard/gui/ksgrd/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/gui/ksgrd/Makefile" ;;
++    "ksysguard/ksysguardd/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Makefile" ;;
++    "ksysguard/ksysguardd/FreeBSD/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/FreeBSD/Makefile" ;;
++    "ksysguard/ksysguardd/Irix/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Irix/Makefile" ;;
++    "ksysguard/ksysguardd/Linux/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Linux/Makefile" ;;
++    "ksysguard/ksysguardd/NetBSD/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/NetBSD/Makefile" ;;
++    "ksysguard/ksysguardd/OpenBSD/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/OpenBSD/Makefile" ;;
++    "ksysguard/ksysguardd/Solaris/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Solaris/Makefile" ;;
++    "ksysguard/ksysguardd/Tru64/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/ksysguardd/Tru64/Makefile" ;;
++    "ksysguard/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ksysguard/pics/Makefile" ;;
++    "ksystraycmd/Makefile") CONFIG_FILES="$CONFIG_FILES ksystraycmd/Makefile" ;;
++    "ktip/Makefile") CONFIG_FILES="$CONFIG_FILES ktip/Makefile" ;;
++    "ktip/pics/Makefile") CONFIG_FILES="$CONFIG_FILES ktip/pics/Makefile" ;;
++    "kwin/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/Makefile" ;;
++    "kwin/clients/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/Makefile" ;;
++    "kwin/clients/b2/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/Makefile" ;;
++    "kwin/clients/b2/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/b2/config/Makefile" ;;
++    "kwin/clients/default/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/default/Makefile" ;;
++    "kwin/clients/default/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/default/config/Makefile" ;;
++    "kwin/clients/keramik/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/Makefile" ;;
++    "kwin/clients/keramik/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/keramik/config/Makefile" ;;
++    "kwin/clients/kwmtheme/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/Makefile" ;;
++    "kwin/clients/kwmtheme/cli_installer/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/kwmtheme/cli_installer/Makefile" ;;
++    "kwin/clients/laptop/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/laptop/Makefile" ;;
++    "kwin/clients/modernsystem/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/Makefile" ;;
++    "kwin/clients/modernsystem/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/modernsystem/config/Makefile" ;;
++    "kwin/clients/plastik/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/Makefile" ;;
++    "kwin/clients/plastik/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/plastik/config/Makefile" ;;
++    "kwin/clients/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/Makefile" ;;
++    "kwin/clients/quartz/config/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/quartz/config/Makefile" ;;
++    "kwin/clients/redmond/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/redmond/Makefile" ;;
++    "kwin/clients/test/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/test/Makefile" ;;
++    "kwin/clients/web/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/clients/web/Makefile" ;;
++    "kwin/data/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/data/Makefile" ;;
++    "kwin/kcmkwin/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/Makefile" ;;
++    "kwin/kcmkwin/kwindecoration/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwindecoration/Makefile" ;;
++    "kwin/kcmkwin/kwinoptions/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinoptions/Makefile" ;;
++    "kwin/kcmkwin/kwinrules/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kcmkwin/kwinrules/Makefile" ;;
++    "kwin/killer/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/killer/Makefile" ;;
++    "kwin/kompmgr/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/kompmgr/Makefile" ;;
++    "kwin/lib/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/lib/Makefile" ;;
++    "kwin/oldheaders/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/oldheaders/Makefile" ;;
++    "kwin/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/pics/Makefile" ;;
++    "kwin/tools/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/tools/Makefile" ;;
++    "kwin/tools/decobenchmark/Makefile") CONFIG_FILES="$CONFIG_FILES kwin/tools/decobenchmark/Makefile" ;;
++    "kxkb/Makefile") CONFIG_FILES="$CONFIG_FILES kxkb/Makefile" ;;
++    "kxkb/pics/Makefile") CONFIG_FILES="$CONFIG_FILES kxkb/pics/Makefile" ;;
++    "l10n/Makefile") CONFIG_FILES="$CONFIG_FILES l10n/Makefile" ;;
++    "libkonq/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/Makefile" ;;
++    "libkonq/favicons/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/favicons/Makefile" ;;
++    "libkonq/pics/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/pics/Makefile" ;;
++    "libkonq/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libkonq/tests/Makefile" ;;
++    "nsplugins/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/Makefile" ;;
++    "nsplugins/test/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/test/Makefile" ;;
++    "nsplugins/viewer/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/viewer/Makefile" ;;
++    "nsplugins/wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES nsplugins/wrapper/Makefile" ;;
++    "pics/Makefile") CONFIG_FILES="$CONFIG_FILES pics/Makefile" ;;
++    "pics/crystalsvg/Makefile") CONFIG_FILES="$CONFIG_FILES pics/crystalsvg/Makefile" ;;
++    "pics/wallpapers/Makefile") CONFIG_FILES="$CONFIG_FILES pics/wallpapers/Makefile" ;;
++    "kdm/kfrontend/sessions/kde.desktop") CONFIG_FILES="$CONFIG_FILES kdm/kfrontend/sessions/kde.desktop" ;;
++    "khelpcenter/searchhandlers/khc_docbookdig.pl") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_docbookdig.pl" ;;
++    "khelpcenter/searchhandlers/khc_htdig.pl") CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/khc_htdig.pl" ;;
++
+   *) { { 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
+@@ -58845,740 +59538,1014 @@
+ 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 PAMLIBS@,$PAMLIBS,;t t
+-s, at LIBSHADOW@,$LIBSHADOW,;t t
+-s, at LIBGEN@,$LIBGEN,;t t
+-s, at SETUIDFLAGS@,$SETUIDFLAGS,;t t
+-s, at PASSWDLIBS@,$PASSWDLIBS,;t t
+-s, at KDM_PAM_SERVICE@,$KDM_PAM_SERVICE,;t t
+-s, at KCHECKPASS_PAM_SERVICE@,$KCHECKPASS_PAM_SERVICE,;t t
+-s, at KSCREENSAVER_PAM_SERVICE@,$KSCREENSAVER_PAM_SERVICE,;t t
+-s, at LIBALIB@,$LIBALIB,;t t
+-s, at LIBRPC@,$LIBRPC,;t t
+-s, at LIBOSSAUDIO@,$LIBOSSAUDIO,;t t
+-s, at LIBCFG@,$LIBCFG,;t t
+-s, at LIBODM@,$LIBODM,;t t
+-s, at LIBCURSES@,$LIBCURSES,;t t
+-s, at LIBUTEMPTER@,$LIBUTEMPTER,;t t
+-s, at LIBKSTAT@,$LIBKSTAT,;t t
+-s, at LIBDEVINFO@,$LIBDEVINFO,;t t
+-s, at JAVAC@,$JAVAC,;t t
+-s, at JAVAH@,$JAVAH,;t t
+-s, at JAR@,$JAR,;t t
+-s, at JVMLIBS@,$JVMLIBS,;t t
+-s, at jni_includes@,$jni_includes,;t t
+-s, at MD5SUM@,$MD5SUM,;t t
+-s, at MD5SUM_CUT@,$MD5SUM_CUT,;t t
+-s, at XTESTLIB@,$XTESTLIB,;t t
+-s, at LIB_XCURSOR@,$LIB_XCURSOR,;t t
+-s, at have_xcursor_TRUE@,$have_xcursor_TRUE,;t t
+-s, at have_xcursor_FALSE@,$have_xcursor_FALSE,;t t
+-s, at QTDOCDIR@,$QTDOCDIR,;t t
+-s, at KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t
+-s, at DOXYGEN@,$DOXYGEN,;t t
+-s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
+-s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
+-s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
+-s, at KDE_BINDIR@,$KDE_BINDIR,;t t
+-s, at LIBART_LIBS@,$LIBART_LIBS,;t t
+-s, at LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
+-s, at LIBART_RPATH@,$LIBART_RPATH,;t t
+-s, at RUN_KAPPFINDER@,$RUN_KAPPFINDER,;t t
+-s, at include_kcontrol_access_TRUE@,$include_kcontrol_access_TRUE,;t t
+-s, at include_kcontrol_access_FALSE@,$include_kcontrol_access_FALSE,;t t
+-s, at include_kcontrol_accessibility_TRUE@,$include_kcontrol_accessibility_TRUE,;t t
+-s, at include_kcontrol_accessibility_FALSE@,$include_kcontrol_accessibility_FALSE,;t t
+-s, at SSL_INCLUDES@,$SSL_INCLUDES,;t t
+-s, at SSL_LDFLAGS@,$SSL_LDFLAGS,;t t
+-s, at LIBSSL@,$LIBSSL,;t t
+-s, at DPMSINC@,$DPMSINC,;t t
+-s, at DPMSLIB@,$DPMSLIB,;t t
+-s, at LIBFONTCONFIG_LIBS@,$LIBFONTCONFIG_LIBS,;t t
+-s, at LIBFONTCONFIG_CFLAGS@,$LIBFONTCONFIG_CFLAGS,;t t
+-s, at LIBFONTCONFIG_RPATH@,$LIBFONTCONFIG_RPATH,;t t
+-s, at LIB_TRU64_MACH@,$LIB_TRU64_MACH,;t t
+-s, at GLINC@,$GLINC,;t t
+-s, at GLLIB@,$GLLIB,;t t
+-s, at COMPILE_GL_INFO_TRUE@,$COMPILE_GL_INFO_TRUE,;t t
+-s, at COMPILE_GL_INFO_FALSE@,$COMPILE_GL_INFO_FALSE,;t t
+-s, at LIBUSBCONFIG@,$LIBUSBCONFIG,;t t
+-s, at USB_LIBS@,$USB_LIBS,;t t
+-s, at USB_CFLAGS@,$USB_CFLAGS,;t t
+-s, at include_kcontrol_joystick_TRUE@,$include_kcontrol_joystick_TRUE,;t t
+-s, at include_kcontrol_joystick_FALSE@,$include_kcontrol_joystick_FALSE,;t t
+-s, at LIBFREETYPE_LIBS@,$LIBFREETYPE_LIBS,;t t
+-s, at LIBFREETYPE_CFLAGS@,$LIBFREETYPE_CFLAGS,;t t
+-s, at LIBFREETYPE_RPATH@,$LIBFREETYPE_RPATH,;t t
+-s, at UNAME@,$UNAME,;t t
+-s, at LIB_FONT_ENC@,$LIB_FONT_ENC,;t t
+-s, at LIBXFT_LIB@,$LIBXFT_LIB,;t t
+-s, at include_fontinst_tn_TRUE@,$include_fontinst_tn_TRUE,;t t
+-s, at include_fontinst_tn_FALSE@,$include_fontinst_tn_FALSE,;t t
+-s, at include_kcontrol_kfontinst_TRUE@,$include_kcontrol_kfontinst_TRUE,;t t
+-s, at include_kcontrol_kfontinst_FALSE@,$include_kcontrol_kfontinst_FALSE,;t t
+-s, at LIB_XRANDR@,$LIB_XRANDR,;t t
+-s, at include_kcontrol_randr_TRUE@,$include_kcontrol_randr_TRUE,;t t
+-s, at include_kcontrol_randr_FALSE@,$include_kcontrol_randr_FALSE,;t t
+-s, at include_kcontrol_smartcard_TRUE@,$include_kcontrol_smartcard_TRUE,;t t
+-s, at include_kcontrol_smartcard_FALSE@,$include_kcontrol_smartcard_FALSE,;t t
+-s, at include_kcontrol_usbview_TRUE@,$include_kcontrol_usbview_TRUE,;t t
+-s, at include_kcontrol_usbview_FALSE@,$include_kcontrol_usbview_FALSE,;t t
+-s, at install_usbids_TRUE@,$install_usbids_TRUE,;t t
+-s, at install_usbids_FALSE@,$install_usbids_FALSE,;t t
+-s, at include_kcontrol_view1394_TRUE@,$include_kcontrol_view1394_TRUE,;t t
+-s, at include_kcontrol_view1394_FALSE@,$include_kcontrol_view1394_FALSE,;t t
+-s, at LIB_XSS@,$LIB_XSS,;t t
+-s, at LIB_XF86MISC@,$LIB_XF86MISC,;t t
+-s, at nogroup@,$nogroup,;t t
+-s, at LIBXDMCP@,$LIBXDMCP,;t t
+-s, at KRB4_INCS@,$KRB4_INCS,;t t
+-s, at KRB4_LIBS@,$KRB4_LIBS,;t t
+-s, at KRB4_RPATH@,$KRB4_RPATH,;t t
+-s, at LIB_LIBS@,$LIB_LIBS,;t t
+-s, at LIBPOSIX4@,$LIBPOSIX4,;t t
+-s, at KRB5_INCS@,$KRB5_INCS,;t t
+-s, at KRB5_LIBS@,$KRB5_LIBS,;t t
+-s, at KRB5_RPATH@,$KRB5_RPATH,;t t
+-s, at LIB_ARTS@,$LIB_ARTS,;t t
+-s, at ARTS_CFLAGS@,$ARTS_CFLAGS,;t t
+-s, at KHOTKEYS_ARTS_SUBDIR@,$KHOTKEYS_ARTS_SUBDIR,;t t
+-s, at LIB_KVM@,$LIB_KVM,;t t
+-s, at LIB_XCOMPOSITE@,$LIB_XCOMPOSITE,;t t
+-s, at LIB_XFIXES@,$LIB_XFIXES,;t t
+-s, at SASL2_LIBS@,$SASL2_LIBS,;t t
+-s, at LIBBZ2@,$LIBBZ2,;t t
+-s, at include_BZIP2_TRUE@,$include_BZIP2_TRUE,;t t
+-s, at include_BZIP2_FALSE@,$include_BZIP2_FALSE,;t t
+-s, at LIB_LBER@,$LIB_LBER,;t t
+-s, at LDAP_INCS@,$LDAP_INCS,;t t
+-s, at LDAP_LIBS@,$LDAP_LIBS,;t t
+-s, at LDAP_RPATH@,$LDAP_RPATH,;t t
+-s, at include_kioslave_ldap_TRUE@,$include_kioslave_ldap_TRUE,;t t
+-s, at include_kioslave_ldap_FALSE@,$include_kioslave_ldap_FALSE,;t t
+-s, at LINUXCDPOLLING@,$LINUXCDPOLLING,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+-s, at HAL_CFLAGS@,$HAL_CFLAGS,;t t
+-s, at HAL_LIBS@,$HAL_LIBS,;t t
+-s, at HAL_INCS@,$HAL_INCS,;t t
+-s, at DBUS_CFLAGS@,$DBUS_CFLAGS,;t t
+-s, at DBUS_LIBS@,$DBUS_LIBS,;t t
+-s, at DBUS_INCS@,$DBUS_INCS,;t t
+-s, at DBUSQT_INCS@,$DBUSQT_INCS,;t t
+-s, at DBUSQT_LIBS@,$DBUSQT_LIBS,;t t
+-s, at HALBACKEND@,$HALBACKEND,;t t
+-s, at include_media_linuxcdpolling_TRUE@,$include_media_linuxcdpolling_TRUE,;t t
+-s, at include_media_linuxcdpolling_FALSE@,$include_media_linuxcdpolling_FALSE,;t t
+-s, at include_media_halbackend_TRUE@,$include_media_halbackend_TRUE,;t t
+-s, at include_media_halbackend_FALSE@,$include_media_halbackend_FALSE,;t t
+-s, at SMBCLIENT_EXTRA_LIBS@,$SMBCLIENT_EXTRA_LIBS,;t t
+-s, at include_kioslave_smb_TRUE@,$include_kioslave_smb_TRUE,;t t
+-s, at include_kioslave_smb_FALSE@,$include_kioslave_smb_FALSE,;t t
+-s, at LIB_EXR@,$LIB_EXR,;t t
+-s, at EXR_FLAGS@,$EXR_FLAGS,;t t
+-s, at include_EXR_MODULES_TRUE@,$include_EXR_MODULES_TRUE,;t t
+-s, at include_EXR_MODULES_FALSE@,$include_EXR_MODULES_FALSE,;t t
+-s, at LIBMALLOC@,$LIBMALLOC,;t t
+-s, at LIB_XINERAMA@,$LIB_XINERAMA,;t t
+-s, at include_ksysguardd_TRUE@,$include_ksysguardd_TRUE,;t t
+-s, at include_ksysguardd_FALSE@,$include_ksysguardd_FALSE,;t t
+-s, at include_ksysguardd_linux_TRUE@,$include_ksysguardd_linux_TRUE,;t t
+-s, at include_ksysguardd_linux_FALSE@,$include_ksysguardd_linux_FALSE,;t t
+-s, at include_ksysguardd_freebsd_TRUE@,$include_ksysguardd_freebsd_TRUE,;t t
+-s, at include_ksysguardd_freebsd_FALSE@,$include_ksysguardd_freebsd_FALSE,;t t
+-s, at include_ksysguardd_netbsd_TRUE@,$include_ksysguardd_netbsd_TRUE,;t t
+-s, at include_ksysguardd_netbsd_FALSE@,$include_ksysguardd_netbsd_FALSE,;t t
+-s, at include_ksysguardd_solaris_TRUE@,$include_ksysguardd_solaris_TRUE,;t t
+-s, at include_ksysguardd_solaris_FALSE@,$include_ksysguardd_solaris_FALSE,;t t
+-s, at include_ksysguardd_tru64_TRUE@,$include_ksysguardd_tru64_TRUE,;t t
+-s, at include_ksysguardd_tru64_FALSE@,$include_ksysguardd_tru64_FALSE,;t t
+-s, at include_ksysguardd_irix_TRUE@,$include_ksysguardd_irix_TRUE,;t t
+-s, at include_ksysguardd_irix_FALSE@,$include_ksysguardd_irix_FALSE,;t t
+-s, at include_ksysguardd_openbsd_TRUE@,$include_ksysguardd_openbsd_TRUE,;t t
+-s, at include_ksysguardd_openbsd_FALSE@,$include_ksysguardd_openbsd_FALSE,;t t
+-s, at LIBHOSTS@,$LIBHOSTS,;t t
+-s, at LIBSENSORS@,$LIBSENSORS,;t t
+-s, at supports_i8k_TRUE@,$supports_i8k_TRUE,;t t
+-s, at supports_i8k_FALSE@,$supports_i8k_FALSE,;t t
+-s, at LIB_DNSSD@,$LIB_DNSSD,;t t
+-s, at HAVE_DNSSD_TRUE@,$HAVE_DNSSD_TRUE,;t t
+-s, at HAVE_DNSSD_FALSE@,$HAVE_DNSSD_FALSE,;t t
+-s, at include_kompmgr_TRUE@,$include_kompmgr_TRUE,;t t
+-s, at include_kompmgr_FALSE@,$include_kompmgr_FALSE,;t t
+-s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
+-s, at libkonq_SUBDIR_included_TRUE@,$libkonq_SUBDIR_included_TRUE,;t t
+-s, at libkonq_SUBDIR_included_FALSE@,$libkonq_SUBDIR_included_FALSE,;t t
+-s, at applnk_SUBDIR_included_TRUE@,$applnk_SUBDIR_included_TRUE,;t t
+-s, at applnk_SUBDIR_included_FALSE@,$applnk_SUBDIR_included_FALSE,;t t
+-s, at doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t
+-s, at doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t
+-s, at drkonqi_SUBDIR_included_TRUE@,$drkonqi_SUBDIR_included_TRUE,;t t
+-s, at drkonqi_SUBDIR_included_FALSE@,$drkonqi_SUBDIR_included_FALSE,;t t
+-s, at kappfinder_SUBDIR_included_TRUE@,$kappfinder_SUBDIR_included_TRUE,;t t
+-s, at kappfinder_SUBDIR_included_FALSE@,$kappfinder_SUBDIR_included_FALSE,;t t
+-s, at kate_SUBDIR_included_TRUE@,$kate_SUBDIR_included_TRUE,;t t
+-s, at kate_SUBDIR_included_FALSE@,$kate_SUBDIR_included_FALSE,;t t
+-s, at kcheckpass_SUBDIR_included_TRUE@,$kcheckpass_SUBDIR_included_TRUE,;t t
+-s, at kcheckpass_SUBDIR_included_FALSE@,$kcheckpass_SUBDIR_included_FALSE,;t t
+-s, at kcminit_SUBDIR_included_TRUE@,$kcminit_SUBDIR_included_TRUE,;t t
+-s, at kcminit_SUBDIR_included_FALSE@,$kcminit_SUBDIR_included_FALSE,;t t
+-s, at kdcop_SUBDIR_included_TRUE@,$kdcop_SUBDIR_included_TRUE,;t t
+-s, at kdcop_SUBDIR_included_FALSE@,$kdcop_SUBDIR_included_FALSE,;t t
+-s, at kdebugdialog_SUBDIR_included_TRUE@,$kdebugdialog_SUBDIR_included_TRUE,;t t
+-s, at kdebugdialog_SUBDIR_included_FALSE@,$kdebugdialog_SUBDIR_included_FALSE,;t t
+-s, at kdeeject_SUBDIR_included_TRUE@,$kdeeject_SUBDIR_included_TRUE,;t t
+-s, at kdeeject_SUBDIR_included_FALSE@,$kdeeject_SUBDIR_included_FALSE,;t t
+-s, at kdepasswd_SUBDIR_included_TRUE@,$kdepasswd_SUBDIR_included_TRUE,;t t
+-s, at kdepasswd_SUBDIR_included_FALSE@,$kdepasswd_SUBDIR_included_FALSE,;t t
+-s, at kdeprint_SUBDIR_included_TRUE@,$kdeprint_SUBDIR_included_TRUE,;t t
+-s, at kdeprint_SUBDIR_included_FALSE@,$kdeprint_SUBDIR_included_FALSE,;t t
+-s, at kdesu_SUBDIR_included_TRUE@,$kdesu_SUBDIR_included_TRUE,;t t
+-s, at kdesu_SUBDIR_included_FALSE@,$kdesu_SUBDIR_included_FALSE,;t t
+-s, at kdialog_SUBDIR_included_TRUE@,$kdialog_SUBDIR_included_TRUE,;t t
+-s, at kdialog_SUBDIR_included_FALSE@,$kdialog_SUBDIR_included_FALSE,;t t
+-s, at kdmlib_SUBDIR_included_TRUE@,$kdmlib_SUBDIR_included_TRUE,;t t
+-s, at kdmlib_SUBDIR_included_FALSE@,$kdmlib_SUBDIR_included_FALSE,;t t
+-s, at kfind_SUBDIR_included_TRUE@,$kfind_SUBDIR_included_TRUE,;t t
+-s, at kfind_SUBDIR_included_FALSE@,$kfind_SUBDIR_included_FALSE,;t t
+-s, at khelpcenter_SUBDIR_included_TRUE@,$khelpcenter_SUBDIR_included_TRUE,;t t
+-s, at khelpcenter_SUBDIR_included_FALSE@,$khelpcenter_SUBDIR_included_FALSE,;t t
+-s, at khotkeys_SUBDIR_included_TRUE@,$khotkeys_SUBDIR_included_TRUE,;t t
+-s, at khotkeys_SUBDIR_included_FALSE@,$khotkeys_SUBDIR_included_FALSE,;t t
+-s, at kioslave_SUBDIR_included_TRUE@,$kioslave_SUBDIR_included_TRUE,;t t
+-s, at kioslave_SUBDIR_included_FALSE@,$kioslave_SUBDIR_included_FALSE,;t t
+-s, at klipper_SUBDIR_included_TRUE@,$klipper_SUBDIR_included_TRUE,;t t
+-s, at klipper_SUBDIR_included_FALSE@,$klipper_SUBDIR_included_FALSE,;t t
+-s, at kmenuedit_SUBDIR_included_TRUE@,$kmenuedit_SUBDIR_included_TRUE,;t t
+-s, at kmenuedit_SUBDIR_included_FALSE@,$kmenuedit_SUBDIR_included_FALSE,;t t
+-s, at knetattach_SUBDIR_included_TRUE@,$knetattach_SUBDIR_included_TRUE,;t t
+-s, at knetattach_SUBDIR_included_FALSE@,$knetattach_SUBDIR_included_FALSE,;t t
+-s, at konsole_SUBDIR_included_TRUE@,$konsole_SUBDIR_included_TRUE,;t t
+-s, at konsole_SUBDIR_included_FALSE@,$konsole_SUBDIR_included_FALSE,;t t
+-s, at kpager_SUBDIR_included_TRUE@,$kpager_SUBDIR_included_TRUE,;t t
+-s, at kpager_SUBDIR_included_FALSE@,$kpager_SUBDIR_included_FALSE,;t t
+-s, at kpersonalizer_SUBDIR_included_TRUE@,$kpersonalizer_SUBDIR_included_TRUE,;t t
+-s, at kpersonalizer_SUBDIR_included_FALSE@,$kpersonalizer_SUBDIR_included_FALSE,;t t
+-s, at kreadconfig_SUBDIR_included_TRUE@,$kreadconfig_SUBDIR_included_TRUE,;t t
+-s, at kreadconfig_SUBDIR_included_FALSE@,$kreadconfig_SUBDIR_included_FALSE,;t t
+-s, at kscreensaver_SUBDIR_included_TRUE@,$kscreensaver_SUBDIR_included_TRUE,;t t
+-s, at kscreensaver_SUBDIR_included_FALSE@,$kscreensaver_SUBDIR_included_FALSE,;t t
+-s, at ksplashml_SUBDIR_included_TRUE@,$ksplashml_SUBDIR_included_TRUE,;t t
+-s, at ksplashml_SUBDIR_included_FALSE@,$ksplashml_SUBDIR_included_FALSE,;t t
+-s, at kstart_SUBDIR_included_TRUE@,$kstart_SUBDIR_included_TRUE,;t t
+-s, at kstart_SUBDIR_included_FALSE@,$kstart_SUBDIR_included_FALSE,;t t
+-s, at ksysguard_SUBDIR_included_TRUE@,$ksysguard_SUBDIR_included_TRUE,;t t
+-s, at ksysguard_SUBDIR_included_FALSE@,$ksysguard_SUBDIR_included_FALSE,;t t
+-s, at ksystraycmd_SUBDIR_included_TRUE@,$ksystraycmd_SUBDIR_included_TRUE,;t t
+-s, at ksystraycmd_SUBDIR_included_FALSE@,$ksystraycmd_SUBDIR_included_FALSE,;t t
+-s, at ktip_SUBDIR_included_TRUE@,$ktip_SUBDIR_included_TRUE,;t t
+-s, at ktip_SUBDIR_included_FALSE@,$ktip_SUBDIR_included_FALSE,;t t
+-s, at kwin_SUBDIR_included_TRUE@,$kwin_SUBDIR_included_TRUE,;t t
+-s, at kwin_SUBDIR_included_FALSE@,$kwin_SUBDIR_included_FALSE,;t t
+-s, at kxkb_SUBDIR_included_TRUE@,$kxkb_SUBDIR_included_TRUE,;t t
+-s, at kxkb_SUBDIR_included_FALSE@,$kxkb_SUBDIR_included_FALSE,;t t
+-s, at l10n_SUBDIR_included_TRUE@,$l10n_SUBDIR_included_TRUE,;t t
+-s, at l10n_SUBDIR_included_FALSE@,$l10n_SUBDIR_included_FALSE,;t t
+-s, at nsplugins_SUBDIR_included_TRUE@,$nsplugins_SUBDIR_included_TRUE,;t t
+-s, at nsplugins_SUBDIR_included_FALSE@,$nsplugins_SUBDIR_included_FALSE,;t t
+-s, at pics_SUBDIR_included_TRUE@,$pics_SUBDIR_included_TRUE,;t t
+-s, at pics_SUBDIR_included_FALSE@,$pics_SUBDIR_included_FALSE,;t t
+-s, at konqueror_SUBDIR_included_TRUE@,$konqueror_SUBDIR_included_TRUE,;t t
+-s, at konqueror_SUBDIR_included_FALSE@,$konqueror_SUBDIR_included_FALSE,;t t
+-s, at ksmserver_SUBDIR_included_TRUE@,$ksmserver_SUBDIR_included_TRUE,;t t
+-s, at ksmserver_SUBDIR_included_FALSE@,$ksmserver_SUBDIR_included_FALSE,;t t
+-s, at kicker_SUBDIR_included_TRUE@,$kicker_SUBDIR_included_TRUE,;t t
+-s, at kicker_SUBDIR_included_FALSE@,$kicker_SUBDIR_included_FALSE,;t t
+-s, at kcontrol_SUBDIR_included_TRUE@,$kcontrol_SUBDIR_included_TRUE,;t t
+-s, at kcontrol_SUBDIR_included_FALSE@,$kcontrol_SUBDIR_included_FALSE,;t t
+-s, at kdesktop_SUBDIR_included_TRUE@,$kdesktop_SUBDIR_included_TRUE,;t t
+-s, at kdesktop_SUBDIR_included_FALSE@,$kdesktop_SUBDIR_included_FALSE,;t t
+-s, at kdm_SUBDIR_included_TRUE@,$kdm_SUBDIR_included_TRUE,;t t
+-s, at kdm_SUBDIR_included_FALSE@,$kdm_SUBDIR_included_FALSE,;t t
+-s, at LIBOBJS@,$LIBOBJS,;t t
+-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
++
++_ACEOF
++
++
++
++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
++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 `grep -c "$ac_delim\$" conf$$subs.sed` = 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=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$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
++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 `grep -c "$ac_delim\$" conf$$subs.sed` = 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=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$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
++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
++PAMLIBS!$PAMLIBS$ac_delim
++LIBSHADOW!$LIBSHADOW$ac_delim
++LIBGEN!$LIBGEN$ac_delim
++SETUIDFLAGS!$SETUIDFLAGS$ac_delim
++PASSWDLIBS!$PASSWDLIBS$ac_delim
++KDM_PAM_SERVICE!$KDM_PAM_SERVICE$ac_delim
++KCHECKPASS_PAM_SERVICE!$KCHECKPASS_PAM_SERVICE$ac_delim
++KSCREENSAVER_PAM_SERVICE!$KSCREENSAVER_PAM_SERVICE$ac_delim
++LIBALIB!$LIBALIB$ac_delim
++LIBRPC!$LIBRPC$ac_delim
++LIBOSSAUDIO!$LIBOSSAUDIO$ac_delim
++LIBCFG!$LIBCFG$ac_delim
++LIBODM!$LIBODM$ac_delim
++LIBCURSES!$LIBCURSES$ac_delim
++LIBUTEMPTER!$LIBUTEMPTER$ac_delim
++LIBKSTAT!$LIBKSTAT$ac_delim
++LIBDEVINFO!$LIBDEVINFO$ac_delim
++JAVAC!$JAVAC$ac_delim
++JAVAH!$JAVAH$ac_delim
++JAR!$JAR$ac_delim
++JVMLIBS!$JVMLIBS$ac_delim
++jni_includes!$jni_includes$ac_delim
++MD5SUM!$MD5SUM$ac_delim
++MD5SUM_CUT!$MD5SUM_CUT$ac_delim
++XTESTLIB!$XTESTLIB$ac_delim
++LIB_XCURSOR!$LIB_XCURSOR$ac_delim
++have_xcursor_TRUE!$have_xcursor_TRUE$ac_delim
++have_xcursor_FALSE!$have_xcursor_FALSE$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
++KDE_BINDIR!$KDE_BINDIR$ac_delim
++LIBART_LIBS!$LIBART_LIBS$ac_delim
++LIBART_CFLAGS!$LIBART_CFLAGS$ac_delim
++LIBART_RPATH!$LIBART_RPATH$ac_delim
++RUN_KAPPFINDER!$RUN_KAPPFINDER$ac_delim
++include_kcontrol_access_TRUE!$include_kcontrol_access_TRUE$ac_delim
++include_kcontrol_access_FALSE!$include_kcontrol_access_FALSE$ac_delim
++include_kcontrol_accessibility_TRUE!$include_kcontrol_accessibility_TRUE$ac_delim
++include_kcontrol_accessibility_FALSE!$include_kcontrol_accessibility_FALSE$ac_delim
++SSL_INCLUDES!$SSL_INCLUDES$ac_delim
++SSL_LDFLAGS!$SSL_LDFLAGS$ac_delim
++LIBSSL!$LIBSSL$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 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=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$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
++DPMSINC!$DPMSINC$ac_delim
++DPMSLIB!$DPMSLIB$ac_delim
++LIBFONTCONFIG_LIBS!$LIBFONTCONFIG_LIBS$ac_delim
++LIBFONTCONFIG_CFLAGS!$LIBFONTCONFIG_CFLAGS$ac_delim
++LIBFONTCONFIG_RPATH!$LIBFONTCONFIG_RPATH$ac_delim
++LIB_TRU64_MACH!$LIB_TRU64_MACH$ac_delim
++GLINC!$GLINC$ac_delim
++GLLIB!$GLLIB$ac_delim
++COMPILE_GL_INFO_TRUE!$COMPILE_GL_INFO_TRUE$ac_delim
++COMPILE_GL_INFO_FALSE!$COMPILE_GL_INFO_FALSE$ac_delim
++LIBUSBCONFIG!$LIBUSBCONFIG$ac_delim
++USB_LIBS!$USB_LIBS$ac_delim
++USB_CFLAGS!$USB_CFLAGS$ac_delim
++include_kcontrol_joystick_TRUE!$include_kcontrol_joystick_TRUE$ac_delim
++include_kcontrol_joystick_FALSE!$include_kcontrol_joystick_FALSE$ac_delim
++LIBFREETYPE_LIBS!$LIBFREETYPE_LIBS$ac_delim
++LIBFREETYPE_CFLAGS!$LIBFREETYPE_CFLAGS$ac_delim
++LIBFREETYPE_RPATH!$LIBFREETYPE_RPATH$ac_delim
++UNAME!$UNAME$ac_delim
++LIB_FONT_ENC!$LIB_FONT_ENC$ac_delim
++LIBXFT_LIB!$LIBXFT_LIB$ac_delim
++include_fontinst_tn_TRUE!$include_fontinst_tn_TRUE$ac_delim
++include_fontinst_tn_FALSE!$include_fontinst_tn_FALSE$ac_delim
++include_kcontrol_kfontinst_TRUE!$include_kcontrol_kfontinst_TRUE$ac_delim
++include_kcontrol_kfontinst_FALSE!$include_kcontrol_kfontinst_FALSE$ac_delim
++LIB_XRANDR!$LIB_XRANDR$ac_delim
++include_kcontrol_randr_TRUE!$include_kcontrol_randr_TRUE$ac_delim
++include_kcontrol_randr_FALSE!$include_kcontrol_randr_FALSE$ac_delim
++include_kcontrol_smartcard_TRUE!$include_kcontrol_smartcard_TRUE$ac_delim
++include_kcontrol_smartcard_FALSE!$include_kcontrol_smartcard_FALSE$ac_delim
++include_kcontrol_usbview_TRUE!$include_kcontrol_usbview_TRUE$ac_delim
++include_kcontrol_usbview_FALSE!$include_kcontrol_usbview_FALSE$ac_delim
++install_usbids_TRUE!$install_usbids_TRUE$ac_delim
++install_usbids_FALSE!$install_usbids_FALSE$ac_delim
++include_kcontrol_view1394_TRUE!$include_kcontrol_view1394_TRUE$ac_delim
++include_kcontrol_view1394_FALSE!$include_kcontrol_view1394_FALSE$ac_delim
++LIB_XSS!$LIB_XSS$ac_delim
++LIB_XF86MISC!$LIB_XF86MISC$ac_delim
++nogroup!$nogroup$ac_delim
++LIBXDMCP!$LIBXDMCP$ac_delim
++KRB4_INCS!$KRB4_INCS$ac_delim
++KRB4_LIBS!$KRB4_LIBS$ac_delim
++KRB4_RPATH!$KRB4_RPATH$ac_delim
++LIB_LIBS!$LIB_LIBS$ac_delim
++LIBPOSIX4!$LIBPOSIX4$ac_delim
++KRB5_INCS!$KRB5_INCS$ac_delim
++KRB5_LIBS!$KRB5_LIBS$ac_delim
++KRB5_RPATH!$KRB5_RPATH$ac_delim
++LIB_ARTS!$LIB_ARTS$ac_delim
++ARTS_CFLAGS!$ARTS_CFLAGS$ac_delim
++KHOTKEYS_ARTS_SUBDIR!$KHOTKEYS_ARTS_SUBDIR$ac_delim
++LIB_KVM!$LIB_KVM$ac_delim
++LIB_XCOMPOSITE!$LIB_XCOMPOSITE$ac_delim
++LIB_XFIXES!$LIB_XFIXES$ac_delim
++SASL2_LIBS!$SASL2_LIBS$ac_delim
++LIBBZ2!$LIBBZ2$ac_delim
++include_BZIP2_TRUE!$include_BZIP2_TRUE$ac_delim
++include_BZIP2_FALSE!$include_BZIP2_FALSE$ac_delim
++LIB_LBER!$LIB_LBER$ac_delim
++LDAP_INCS!$LDAP_INCS$ac_delim
++LDAP_LIBS!$LDAP_LIBS$ac_delim
++LDAP_RPATH!$LDAP_RPATH$ac_delim
++include_kioslave_ldap_TRUE!$include_kioslave_ldap_TRUE$ac_delim
++include_kioslave_ldap_FALSE!$include_kioslave_ldap_FALSE$ac_delim
++LINUXCDPOLLING!$LINUXCDPOLLING$ac_delim
++PKG_CONFIG!$PKG_CONFIG$ac_delim
++HAL_CFLAGS!$HAL_CFLAGS$ac_delim
++HAL_LIBS!$HAL_LIBS$ac_delim
++HAL_INCS!$HAL_INCS$ac_delim
++DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
++DBUS_LIBS!$DBUS_LIBS$ac_delim
++DBUS_INCS!$DBUS_INCS$ac_delim
++DBUSQT_INCS!$DBUSQT_INCS$ac_delim
++DBUSQT_LIBS!$DBUSQT_LIBS$ac_delim
++HALBACKEND!$HALBACKEND$ac_delim
++include_media_linuxcdpolling_TRUE!$include_media_linuxcdpolling_TRUE$ac_delim
++include_media_linuxcdpolling_FALSE!$include_media_linuxcdpolling_FALSE$ac_delim
++include_media_halbackend_TRUE!$include_media_halbackend_TRUE$ac_delim
++include_media_halbackend_FALSE!$include_media_halbackend_FALSE$ac_delim
++SMBCLIENT_EXTRA_LIBS!$SMBCLIENT_EXTRA_LIBS$ac_delim
++include_kioslave_smb_TRUE!$include_kioslave_smb_TRUE$ac_delim
++include_kioslave_smb_FALSE!$include_kioslave_smb_FALSE$ac_delim
++LIB_EXR!$LIB_EXR$ac_delim
++EXR_FLAGS!$EXR_FLAGS$ac_delim
++include_EXR_MODULES_TRUE!$include_EXR_MODULES_TRUE$ac_delim
++include_EXR_MODULES_FALSE!$include_EXR_MODULES_FALSE$ac_delim
++LIBMALLOC!$LIBMALLOC$ac_delim
++LIB_XINERAMA!$LIB_XINERAMA$ac_delim
++include_ksysguardd_TRUE!$include_ksysguardd_TRUE$ac_delim
++include_ksysguardd_FALSE!$include_ksysguardd_FALSE$ac_delim
++include_ksysguardd_linux_TRUE!$include_ksysguardd_linux_TRUE$ac_delim
++include_ksysguardd_linux_FALSE!$include_ksysguardd_linux_FALSE$ac_delim
++include_ksysguardd_freebsd_TRUE!$include_ksysguardd_freebsd_TRUE$ac_delim
++include_ksysguardd_freebsd_FALSE!$include_ksysguardd_freebsd_FALSE$ac_delim
++include_ksysguardd_netbsd_TRUE!$include_ksysguardd_netbsd_TRUE$ac_delim
++include_ksysguardd_netbsd_FALSE!$include_ksysguardd_netbsd_FALSE$ac_delim
++include_ksysguardd_solaris_TRUE!$include_ksysguardd_solaris_TRUE$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 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=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$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
++
++
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  cat >conf$$subs.sed <<_ACEOF
++include_ksysguardd_solaris_FALSE!$include_ksysguardd_solaris_FALSE$ac_delim
++include_ksysguardd_tru64_TRUE!$include_ksysguardd_tru64_TRUE$ac_delim
++include_ksysguardd_tru64_FALSE!$include_ksysguardd_tru64_FALSE$ac_delim
++include_ksysguardd_irix_TRUE!$include_ksysguardd_irix_TRUE$ac_delim
++include_ksysguardd_irix_FALSE!$include_ksysguardd_irix_FALSE$ac_delim
++include_ksysguardd_openbsd_TRUE!$include_ksysguardd_openbsd_TRUE$ac_delim
++include_ksysguardd_openbsd_FALSE!$include_ksysguardd_openbsd_FALSE$ac_delim
++LIBHOSTS!$LIBHOSTS$ac_delim
++LIBSENSORS!$LIBSENSORS$ac_delim
++supports_i8k_TRUE!$supports_i8k_TRUE$ac_delim
++supports_i8k_FALSE!$supports_i8k_FALSE$ac_delim
++LIB_DNSSD!$LIB_DNSSD$ac_delim
++HAVE_DNSSD_TRUE!$HAVE_DNSSD_TRUE$ac_delim
++HAVE_DNSSD_FALSE!$HAVE_DNSSD_FALSE$ac_delim
++include_kompmgr_TRUE!$include_kompmgr_TRUE$ac_delim
++include_kompmgr_FALSE!$include_kompmgr_FALSE$ac_delim
++TOPSUBDIRS!$TOPSUBDIRS$ac_delim
++libkonq_SUBDIR_included_TRUE!$libkonq_SUBDIR_included_TRUE$ac_delim
++libkonq_SUBDIR_included_FALSE!$libkonq_SUBDIR_included_FALSE$ac_delim
++applnk_SUBDIR_included_TRUE!$applnk_SUBDIR_included_TRUE$ac_delim
++applnk_SUBDIR_included_FALSE!$applnk_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
++drkonqi_SUBDIR_included_TRUE!$drkonqi_SUBDIR_included_TRUE$ac_delim
++drkonqi_SUBDIR_included_FALSE!$drkonqi_SUBDIR_included_FALSE$ac_delim
++kappfinder_SUBDIR_included_TRUE!$kappfinder_SUBDIR_included_TRUE$ac_delim
++kappfinder_SUBDIR_included_FALSE!$kappfinder_SUBDIR_included_FALSE$ac_delim
++kate_SUBDIR_included_TRUE!$kate_SUBDIR_included_TRUE$ac_delim
++kate_SUBDIR_included_FALSE!$kate_SUBDIR_included_FALSE$ac_delim
++kcheckpass_SUBDIR_included_TRUE!$kcheckpass_SUBDIR_included_TRUE$ac_delim
++kcheckpass_SUBDIR_included_FALSE!$kcheckpass_SUBDIR_included_FALSE$ac_delim
++kcminit_SUBDIR_included_TRUE!$kcminit_SUBDIR_included_TRUE$ac_delim
++kcminit_SUBDIR_included_FALSE!$kcminit_SUBDIR_included_FALSE$ac_delim
++kdcop_SUBDIR_included_TRUE!$kdcop_SUBDIR_included_TRUE$ac_delim
++kdcop_SUBDIR_included_FALSE!$kdcop_SUBDIR_included_FALSE$ac_delim
++kdebugdialog_SUBDIR_included_TRUE!$kdebugdialog_SUBDIR_included_TRUE$ac_delim
++kdebugdialog_SUBDIR_included_FALSE!$kdebugdialog_SUBDIR_included_FALSE$ac_delim
++kdeeject_SUBDIR_included_TRUE!$kdeeject_SUBDIR_included_TRUE$ac_delim
++kdeeject_SUBDIR_included_FALSE!$kdeeject_SUBDIR_included_FALSE$ac_delim
++kdepasswd_SUBDIR_included_TRUE!$kdepasswd_SUBDIR_included_TRUE$ac_delim
++kdepasswd_SUBDIR_included_FALSE!$kdepasswd_SUBDIR_included_FALSE$ac_delim
++kdeprint_SUBDIR_included_TRUE!$kdeprint_SUBDIR_included_TRUE$ac_delim
++kdeprint_SUBDIR_included_FALSE!$kdeprint_SUBDIR_included_FALSE$ac_delim
++kdesu_SUBDIR_included_TRUE!$kdesu_SUBDIR_included_TRUE$ac_delim
++kdesu_SUBDIR_included_FALSE!$kdesu_SUBDIR_included_FALSE$ac_delim
++kdialog_SUBDIR_included_TRUE!$kdialog_SUBDIR_included_TRUE$ac_delim
++kdialog_SUBDIR_included_FALSE!$kdialog_SUBDIR_included_FALSE$ac_delim
++kdmlib_SUBDIR_included_TRUE!$kdmlib_SUBDIR_included_TRUE$ac_delim
++kdmlib_SUBDIR_included_FALSE!$kdmlib_SUBDIR_included_FALSE$ac_delim
++kfind_SUBDIR_included_TRUE!$kfind_SUBDIR_included_TRUE$ac_delim
++kfind_SUBDIR_included_FALSE!$kfind_SUBDIR_included_FALSE$ac_delim
++khelpcenter_SUBDIR_included_TRUE!$khelpcenter_SUBDIR_included_TRUE$ac_delim
++khelpcenter_SUBDIR_included_FALSE!$khelpcenter_SUBDIR_included_FALSE$ac_delim
++khotkeys_SUBDIR_included_TRUE!$khotkeys_SUBDIR_included_TRUE$ac_delim
++khotkeys_SUBDIR_included_FALSE!$khotkeys_SUBDIR_included_FALSE$ac_delim
++kioslave_SUBDIR_included_TRUE!$kioslave_SUBDIR_included_TRUE$ac_delim
++kioslave_SUBDIR_included_FALSE!$kioslave_SUBDIR_included_FALSE$ac_delim
++klipper_SUBDIR_included_TRUE!$klipper_SUBDIR_included_TRUE$ac_delim
++klipper_SUBDIR_included_FALSE!$klipper_SUBDIR_included_FALSE$ac_delim
++kmenuedit_SUBDIR_included_TRUE!$kmenuedit_SUBDIR_included_TRUE$ac_delim
++kmenuedit_SUBDIR_included_FALSE!$kmenuedit_SUBDIR_included_FALSE$ac_delim
++knetattach_SUBDIR_included_TRUE!$knetattach_SUBDIR_included_TRUE$ac_delim
++knetattach_SUBDIR_included_FALSE!$knetattach_SUBDIR_included_FALSE$ac_delim
++konsole_SUBDIR_included_TRUE!$konsole_SUBDIR_included_TRUE$ac_delim
++konsole_SUBDIR_included_FALSE!$konsole_SUBDIR_included_FALSE$ac_delim
++kpager_SUBDIR_included_TRUE!$kpager_SUBDIR_included_TRUE$ac_delim
++kpager_SUBDIR_included_FALSE!$kpager_SUBDIR_included_FALSE$ac_delim
++kpersonalizer_SUBDIR_included_TRUE!$kpersonalizer_SUBDIR_included_TRUE$ac_delim
++kpersonalizer_SUBDIR_included_FALSE!$kpersonalizer_SUBDIR_included_FALSE$ac_delim
++kreadconfig_SUBDIR_included_TRUE!$kreadconfig_SUBDIR_included_TRUE$ac_delim
++kreadconfig_SUBDIR_included_FALSE!$kreadconfig_SUBDIR_included_FALSE$ac_delim
++kscreensaver_SUBDIR_included_TRUE!$kscreensaver_SUBDIR_included_TRUE$ac_delim
++kscreensaver_SUBDIR_included_FALSE!$kscreensaver_SUBDIR_included_FALSE$ac_delim
++ksplashml_SUBDIR_included_TRUE!$ksplashml_SUBDIR_included_TRUE$ac_delim
++ksplashml_SUBDIR_included_FALSE!$ksplashml_SUBDIR_included_FALSE$ac_delim
++kstart_SUBDIR_included_TRUE!$kstart_SUBDIR_included_TRUE$ac_delim
++kstart_SUBDIR_included_FALSE!$kstart_SUBDIR_included_FALSE$ac_delim
++ksysguard_SUBDIR_included_TRUE!$ksysguard_SUBDIR_included_TRUE$ac_delim
++ksysguard_SUBDIR_included_FALSE!$ksysguard_SUBDIR_included_FALSE$ac_delim
++ksystraycmd_SUBDIR_included_TRUE!$ksystraycmd_SUBDIR_included_TRUE$ac_delim
++ksystraycmd_SUBDIR_included_FALSE!$ksystraycmd_SUBDIR_included_FALSE$ac_delim
++ktip_SUBDIR_included_TRUE!$ktip_SUBDIR_included_TRUE$ac_delim
++ktip_SUBDIR_included_FALSE!$ktip_SUBDIR_included_FALSE$ac_delim
++kwin_SUBDIR_included_TRUE!$kwin_SUBDIR_included_TRUE$ac_delim
++kwin_SUBDIR_included_FALSE!$kwin_SUBDIR_included_FALSE$ac_delim
++kxkb_SUBDIR_included_TRUE!$kxkb_SUBDIR_included_TRUE$ac_delim
++kxkb_SUBDIR_included_FALSE!$kxkb_SUBDIR_included_FALSE$ac_delim
++l10n_SUBDIR_included_TRUE!$l10n_SUBDIR_included_TRUE$ac_delim
++l10n_SUBDIR_included_FALSE!$l10n_SUBDIR_included_FALSE$ac_delim
++nsplugins_SUBDIR_included_TRUE!$nsplugins_SUBDIR_included_TRUE$ac_delim
++nsplugins_SUBDIR_included_FALSE!$nsplugins_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
++konqueror_SUBDIR_included_TRUE!$konqueror_SUBDIR_included_TRUE$ac_delim
++konqueror_SUBDIR_included_FALSE!$konqueror_SUBDIR_included_FALSE$ac_delim
++ksmserver_SUBDIR_included_TRUE!$ksmserver_SUBDIR_included_TRUE$ac_delim
++ksmserver_SUBDIR_included_FALSE!$ksmserver_SUBDIR_included_FALSE$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 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=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$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
++_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
++kicker_SUBDIR_included_TRUE!$kicker_SUBDIR_included_TRUE$ac_delim
++kicker_SUBDIR_included_FALSE!$kicker_SUBDIR_included_FALSE$ac_delim
++kcontrol_SUBDIR_included_TRUE!$kcontrol_SUBDIR_included_TRUE$ac_delim
++kcontrol_SUBDIR_included_FALSE!$kcontrol_SUBDIR_included_FALSE$ac_delim
++kdesktop_SUBDIR_included_TRUE!$kdesktop_SUBDIR_included_TRUE$ac_delim
++kdesktop_SUBDIR_included_FALSE!$kdesktop_SUBDIR_included_FALSE$ac_delim
++kdm_SUBDIR_included_TRUE!$kdm_SUBDIR_included_TRUE$ac_delim
++kdm_SUBDIR_included_FALSE!$kdm_SUBDIR_included_FALSE$ac_delim
++LIBOBJS!$LIBOBJS$ac_delim
++LTLIBOBJS!$LTLIBOBJS$ac_delim
++_ACEOF
++
++  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 10; 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=
++if grep '^CEOF$' conf$$subs.sed >/dev/null; then
++  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
++  ac_eof=`expr 0$ac_eof + 1`
++fi
++
++cat >>$CONFIG_STATUS <<_ACEOF
++cat >"\$tmp/subs-6.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
+ 
 -  if test x"$ac_file" != x-; then
 -    { echo "$as_me:$LINENO: creating $ac_file" >&5
 -echo "$as_me: creating $ac_file" >&6;}
 -    rm -f "$ac_file"
 -  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -59575,6 +58879,12 @@
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-				     sed 's,.*/,,'` by configure."
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=
 +
-+  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
++case `sed -n '/datarootdir/ {
++  p
++  q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p
++' $ac_file_inputs` in
++*datarootdir*) ;;
++*@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
+@@ -59586,248 +60553,122 @@
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s, at configure_input@,$configure_input,;t t
+-s, at srcdir@,$ac_srcdir,;t t
+-s, at abs_srcdir@,$ac_abs_srcdir,;t t
+-s, at top_srcdir@,$ac_top_srcdir,;t t
+-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s, at builddir@,$ac_builddir,;t t
+-s, at abs_builddir@,$ac_abs_builddir,;t t
+-s, at top_builddir@,$ac_top_builddir,;t t
+-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s, at INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
+-
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+-ac_dB='[	 ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
++s&@configure_input@&$configure_input&;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@srcdir@&$ac_srcdir&;t t
++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" | sed -f "$tmp/subs-6.sed" >$tmp/out
+ 
+-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]*,/* & */,
++# (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"'
++
++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
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/defines.sed.
+-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#define' lines.
+-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+   echo 'CEOF
+-  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
+@@ -59838,135 +60679,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.
+@@ -59976,18 +60721,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
+@@ -60009,53 +60765,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
 --- configure.in
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.5.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdebase, "3.5.3") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -18272,7 +45323,15 @@
  dnl generate the config header
 --- doc/faq/Makefile.in
 +++ doc/faq/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18282,7 +45341,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18291,7 +45414,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18303,32 +45426,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +732,10 @@
+@@ -729,10 +738,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=desktop.docbook about.docbook winmng.docbook qt.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2 
-+KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook qt.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook install.docbook configkde.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2 
++KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook qt.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.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 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
 -	@for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+	@for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
++	@for base in kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+	for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
++	for base in kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
  	done
  
@@ -18336,13 +45459,21 @@
  #>+ 5
  distdir-nls:
 -	for file in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+	for file in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
++	for file in kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/glossary/Makefile.in
 +++ doc/glossary/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18352,7 +45483,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18361,7 +45556,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18373,28 +45568,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +735,7 @@
+@@ -732,7 +741,7 @@
  KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdeprintingglossary.docbook checkxrefs index.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) checkxrefs index.docbook kdeprintingglossary.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdeprintingglossary.docbook checkxrefs 
  	@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 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
 -	@for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	@for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
++	@for base in index.docbook kdeprintingglossary.docbook checkxrefs ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
++	for base in index.docbook kdeprintingglossary.docbook checkxrefs ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
  	done
  
@@ -18402,13 +45597,21 @@
  #>+ 5
  distdir-nls:
 -	for file in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	for file in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
++	for file in index.docbook kdeprintingglossary.docbook checkxrefs ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/kappfinder/Makefile.in
 +++ doc/kappfinder/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18418,7 +45621,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18427,7 +45694,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18441,7 +45708,15 @@
  mostlyclean-libtool:
 --- doc/kate/Makefile.in
 +++ doc/kate/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18451,7 +45726,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18460,7 +45799,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18472,28 +45811,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -733,7 +736,7 @@
+@@ -733,7 +742,7 @@
  KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in man-kate.1.docbook unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png Makefile.am kate.png mimetypechooser.png index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.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
-@@ -760,20 +763,20 @@
+@@ -760,20 +769,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
 -	@for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	@for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
++	@for base in part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
++	for base in part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
  	done
  
@@ -18501,13 +45840,21 @@
  #>+ 5
  distdir-nls:
 -	for file in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	for file in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
++	for file in part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/kcontrol/arts/Makefile.in
 +++ doc/kcontrol/arts/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18517,7 +45864,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18526,7 +45937,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18538,42 +45949,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +735,7 @@
- KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook midi.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) midi.docbook index.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -759,20 +762,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
--	@for base in index.docbook midi.docbook ; do \
-+	@for base in midi.docbook index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook midi.docbook ; do \
-+	for base in midi.docbook index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook midi.docbook ; do \
-+	for file in midi.docbook index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kcontrol/background/Makefile.in
 +++ doc/kcontrol/background/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18583,7 +45969,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18592,7 +46042,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18606,7 +46056,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/bell/Makefile.in
 +++ doc/kcontrol/bell/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18616,7 +46074,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18625,7 +46147,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18639,7 +46161,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/cache/Makefile.in
 +++ doc/kcontrol/cache/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18649,7 +46179,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18658,7 +46252,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18672,7 +46266,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/clock/Makefile.in
 +++ doc/kcontrol/clock/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18682,7 +46284,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18691,7 +46357,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18705,7 +46371,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/colors/Makefile.in
 +++ doc/kcontrol/colors/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18715,7 +46389,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18724,7 +46462,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18738,7 +46476,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/cookies/Makefile.in
 +++ doc/kcontrol/cookies/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18748,7 +46494,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18757,7 +46567,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18771,7 +46581,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/crypto/Makefile.in
 +++ doc/kcontrol/crypto/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18781,7 +46599,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18790,7 +46672,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18804,7 +46686,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/desktop/Makefile.in
 +++ doc/kcontrol/desktop/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18814,7 +46704,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18823,7 +46777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18837,7 +46791,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/desktopbehavior/Makefile.in
 +++ doc/kcontrol/desktopbehavior/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18847,7 +46809,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18856,7 +46882,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18870,7 +46896,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/ebrowsing/Makefile.in
 +++ doc/kcontrol/ebrowsing/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18880,7 +46914,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18889,7 +46987,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18903,7 +47001,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/email/Makefile.in
 +++ doc/kcontrol/email/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18913,7 +47019,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18922,7 +47092,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18936,7 +47106,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/energy/Makefile.in
 +++ doc/kcontrol/energy/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18946,7 +47124,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18955,7 +47197,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18969,7 +47211,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/filemanager/Makefile.in
 +++ doc/kcontrol/filemanager/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18979,7 +47229,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18988,7 +47302,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19000,7 +47314,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +735,7 @@
+@@ -732,7 +741,7 @@
  KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -19009,7 +47323,7 @@
  	@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 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
@@ -19035,7 +47349,15 @@
  
 --- doc/kcontrol/filetypes/Makefile.in
 +++ doc/kcontrol/filetypes/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19045,7 +47367,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19054,7 +47440,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19068,7 +47454,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/fonts/Makefile.in
 +++ doc/kcontrol/fonts/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19078,7 +47472,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19087,7 +47545,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19101,7 +47559,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/helpindex/Makefile.in
 +++ doc/kcontrol/helpindex/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19111,7 +47577,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19120,7 +47650,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19134,7 +47664,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/icons/Makefile.in
 +++ doc/kcontrol/icons/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19144,7 +47682,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19153,7 +47755,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19167,7 +47769,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmaccess/Makefile.in
 +++ doc/kcontrol/kcmaccess/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19177,7 +47787,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19186,7 +47860,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19200,7 +47874,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmcss/Makefile.in
 +++ doc/kcontrol/kcmcss/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19210,7 +47892,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19219,7 +47965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19233,7 +47979,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmfontinst/Makefile.in
 +++ doc/kcontrol/kcmfontinst/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19243,7 +47997,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19252,7 +48070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19266,7 +48084,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmkonsole/Makefile.in
 +++ doc/kcontrol/kcmkonsole/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19276,7 +48102,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19285,7 +48175,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19299,7 +48189,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmlaunch/Makefile.in
 +++ doc/kcontrol/kcmlaunch/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19309,7 +48207,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19318,7 +48280,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19332,7 +48294,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmnotify/Makefile.in
 +++ doc/kcontrol/kcmnotify/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19342,7 +48312,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19351,7 +48385,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19365,7 +48399,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmsmserver/Makefile.in
 +++ doc/kcontrol/kcmsmserver/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19375,7 +48417,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19384,7 +48490,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19398,7 +48504,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmstyle/Makefile.in
 +++ doc/kcontrol/kcmstyle/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19408,7 +48522,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19417,7 +48595,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19431,7 +48609,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmtaskbar/Makefile.in
 +++ doc/kcontrol/kcmtaskbar/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19441,7 +48627,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19450,7 +48700,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19464,7 +48714,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kdm/Makefile.in
 +++ doc/kcontrol/kdm/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19474,7 +48732,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19483,7 +48805,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19497,7 +48819,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/keyboard/Makefile.in
 +++ doc/kcontrol/keyboard/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19507,7 +48837,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19516,7 +48910,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19530,7 +48924,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/keys/Makefile.in
 +++ doc/kcontrol/keys/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19540,7 +48942,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19549,7 +49015,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19563,7 +49029,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/khtml/Makefile.in
 +++ doc/kcontrol/khtml/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19573,7 +49047,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19582,7 +49120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19594,7 +49132,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +735,7 @@
+@@ -732,7 +741,7 @@
  KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -19603,7 +49141,7 @@
  	@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 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
@@ -19629,7 +49167,15 @@
  
 --- doc/kcontrol/kwindecoration/Makefile.in
 +++ doc/kcontrol/kwindecoration/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19639,7 +49185,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19648,7 +49258,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19662,7 +49272,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/language/Makefile.in
 +++ doc/kcontrol/language/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19672,7 +49290,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19681,7 +49363,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19695,7 +49377,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/Makefile.in
 +++ doc/kcontrol/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19705,16 +49395,80 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  xdg_menudir = @xdg_menudir@
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
 -SUBDIRS =. background khtml helpindex proxy kcmtaskbar language passwords email fonts desktopbehavior cookies useragent kcmfontinst ebrowsing panel cache filetypes windowmanagement kcmlaunch arts desktop filemanager bell panelappearance crypto kwindecoration screensaver smb kcmcss mouse energy kcmstyle clock kcmaccess keyboard kcmsmserver colors performance kcmnotify netpref kcmkonsole keys kdm icons spellchecking
-+SUBDIRS =. kdm smb spellchecking bell arts keys cookies filetypes desktop cache clock email fonts icons khtml filemanager mouse panel proxy desktopbehavior passwords panelappearance ebrowsing background kcmaccess colors crypto energy kcmstyle netpref kcmlaunch kcmcss kcmnotify kcmsmserver screensaver windowmanagement kwindecoration kcmkonsole language useragent helpindex keyboard kcmtaskbar kcmfontinst performance
++SUBDIRS =. clock passwords kcmfontinst kcmlaunch helpindex bell desktop keyboard cache screensaver email icons arts kcmcss mouse netpref panel colors khtml crypto filetypes cookies fonts kcmstyle desktopbehavior windowmanagement filemanager kcmkonsole kcmsmserver keys background kcmaccess energy performance language spellchecking kdm kcmnotify useragent ebrowsing kcmtaskbar kwindecoration smb proxy panelappearance
  KDE_LANG = en
  KDE_DOCS = AUTO
  #>- all: all-recursive
-@@ -563,7 +566,7 @@
+@@ -563,7 +572,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19723,7 +49477,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19735,42 +49489,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -899,7 +902,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -926,20 +929,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol
--	@for base in index.docbook screenshot.png ; do \
-+	@for base in screenshot.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook screenshot.png ; do \
-+	for base in screenshot.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook screenshot.png ; do \
-+	for file in screenshot.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kcontrol/mouse/Makefile.in
 +++ doc/kcontrol/mouse/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19780,7 +49509,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19789,7 +49582,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19803,7 +49596,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/netpref/Makefile.in
 +++ doc/kcontrol/netpref/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19813,7 +49614,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19822,7 +49687,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19836,7 +49701,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/panel/Makefile.in
 +++ doc/kcontrol/panel/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19846,7 +49719,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19855,7 +49792,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19869,7 +49806,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/panelappearance/Makefile.in
 +++ doc/kcontrol/panelappearance/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19879,7 +49824,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19888,7 +49897,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19902,7 +49911,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/passwords/Makefile.in
 +++ doc/kcontrol/passwords/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19912,7 +49929,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19921,7 +50002,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19935,7 +50016,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/performance/Makefile.in
 +++ doc/kcontrol/performance/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19945,7 +50034,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19954,7 +50107,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19968,7 +50121,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/proxy/Makefile.in
 +++ doc/kcontrol/proxy/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19978,7 +50139,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19987,7 +50212,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20001,7 +50226,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/screensaver/Makefile.in
 +++ doc/kcontrol/screensaver/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20011,7 +50244,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20020,7 +50317,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20034,7 +50331,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/smb/Makefile.in
 +++ doc/kcontrol/smb/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20044,7 +50349,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20053,7 +50422,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20067,7 +50436,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/spellchecking/Makefile.in
 +++ doc/kcontrol/spellchecking/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20077,7 +50454,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20086,7 +50527,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20100,7 +50541,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/useragent/Makefile.in
 +++ doc/kcontrol/useragent/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20110,7 +50559,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20119,7 +50632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20133,7 +50646,15 @@
  mostlyclean-libtool:
 --- doc/kcontrol/windowmanagement/Makefile.in
 +++ doc/kcontrol/windowmanagement/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20143,7 +50664,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20152,7 +50737,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20166,7 +50751,15 @@
  mostlyclean-libtool:
 --- doc/kdcop/Makefile.in
 +++ doc/kdcop/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20176,7 +50769,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20185,7 +50842,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20199,7 +50856,15 @@
  mostlyclean-libtool:
 --- doc/kdebugdialog/Makefile.in
 +++ doc/kdebugdialog/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20209,7 +50874,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20218,7 +50947,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20232,7 +50961,15 @@
  mostlyclean-libtool:
 --- doc/kdeprint/Makefile.in
 +++ doc/kdeprint/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20242,7 +50979,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20251,7 +51052,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20263,32 +51064,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +732,10 @@
+@@ -729,10 +738,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png kprinter_called_from_run_command.png index.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan.png ps-boxes.png cupsserverconfiguration4_directories.png final-word.docbook cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard1.png cups-config.docbook add-printer-wiz.docbook cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png cupsserverconfiguration8_networkgeneral.png rlpr.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png kcron_to_be_printed.png theory.docbook Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2 
-+KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png index.docbook kprinter_called_from_run_command.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png ps-boxes.png cupsaddprinterwizard3_networkscan.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfiguration7_miscellanious.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration5_HTTP.png cups-config.docbook cupsaddprinterwizard1.png cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png rlpr.docbook cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png theory.docbook kcron_to_be_printed.png Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2 
++KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard4_networkscan_config.png highlights.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png index.docbook kprinter_called_from_run_command.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan.png ps-boxes.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration5_HTTP.png cups-config.docbook cupsaddprinterwizard1.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration9_networkclients.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration8_networkgeneral.png rlpr.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png kcron_to_be_printed.png theory.docbook Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.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
-@@ -759,20 +762,20 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
 -	@for base in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
-+	@for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
++	@for base in kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
-+	for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
++	for base in kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
  	done
  
@@ -20296,13 +51097,21 @@
  #>+ 5
  distdir-nls:
 -	for file in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
-+	for file in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
++	for file in kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/kdesu/Makefile.in
 +++ doc/kdesu/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20312,7 +51121,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20321,7 +51194,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20335,7 +51208,15 @@
  mostlyclean-libtool:
 --- doc/kdm/Makefile.in
 +++ doc/kdm/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20345,7 +51226,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20354,7 +51299,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20366,9 +51311,50 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -735,7 +744,7 @@
+ KDE_DIST=index.docbook kdmrc-ref.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdmrc-ref.docbook index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdmrc-ref.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
+@@ -762,20 +771,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm
+-	@for base in kdmrc-ref.docbook index.docbook ; do \
++	@for base in index.docbook kdmrc-ref.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in kdmrc-ref.docbook index.docbook ; do \
++	for base in index.docbook kdmrc-ref.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in kdmrc-ref.docbook index.docbook ; do \
++	for file in index.docbook kdmrc-ref.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/kfind/Makefile.in
 +++ doc/kfind/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20378,7 +51364,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20387,7 +51437,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20399,9 +51449,50 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -733,7 +742,7 @@
+ KDE_DIST=man-kfind.1.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kfind.1.docbook index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook man-kfind.1.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -760,20 +769,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind
+-	@for base in man-kfind.1.docbook index.docbook ; do \
++	@for base in index.docbook man-kfind.1.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in man-kfind.1.docbook index.docbook ; do \
++	for base in index.docbook man-kfind.1.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in man-kfind.1.docbook index.docbook ; do \
++	for file in index.docbook man-kfind.1.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/khelpcenter/Makefile.in
 +++ doc/khelpcenter/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20411,7 +51502,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -563,7 +572,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -20420,7 +51575,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20432,28 +51587,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -899,7 +902,7 @@
- KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png index.cache.bz2 bgtable.png 
+@@ -896,10 +905,10 @@
+ .NOEXPORT:
  
+ #>+ 2
+-KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png index.cache.bz2 bgtable.png 
++KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png bgtable.png index.cache.bz2 
+ 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.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
-@@ -926,20 +929,20 @@
+@@ -926,20 +935,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
 -	@for base in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
-+	@for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
++	@for base in welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
-+	for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
++	for base in welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
  	done
  
@@ -20461,13 +51620,21 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
-+	for file in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
++	for file in welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/kicker/Makefile.in
 +++ doc/kicker/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20477,7 +51644,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20486,7 +51717,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20498,32 +51729,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -730,10 +733,10 @@
+@@ -730,10 +739,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=k_menu_icon.png man-appletproxy.1.docbook screenshot_right.png bookmarks_icon.png man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2 
-+KDE_DIST=k_menu_icon.png bookmarks_icon.png screenshot_right.png man-appletproxy.1.docbook man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2 
++KDE_DIST=k_menu_icon.png man-appletproxy.1.docbook bookmarks_icon.png screenshot_right.png man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.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
-@@ -760,20 +763,20 @@
+@@ -760,20 +769,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
 -	@for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
-+	@for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
++	@for base in screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
-+	for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
++	for base in screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
  	done
  
@@ -20531,13 +51762,21 @@
  #>+ 5
  distdir-nls:
 -	for file in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
-+	for file in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
++	for file in screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/kinfocenter/devices/Makefile.in
 +++ doc/kinfocenter/devices/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20547,7 +51786,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20556,7 +51859,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20570,7 +51873,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/dma/Makefile.in
 +++ doc/kinfocenter/dma/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20580,7 +51891,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20589,7 +51964,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20603,7 +51978,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/interrupts/Makefile.in
 +++ doc/kinfocenter/interrupts/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20613,7 +51996,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20622,7 +52069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20636,7 +52083,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/ioports/Makefile.in
 +++ doc/kinfocenter/ioports/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20646,7 +52101,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20655,7 +52174,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20669,7 +52188,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/Makefile.in
 +++ doc/kinfocenter/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20679,16 +52206,80 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  xdg_menudir = @xdg_menudir@
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
 -SUBDIRS =. processor interrupts devices samba protocols opengl sound usb pcmcia partitions nics xserver ioports scsi dma memory pci
-+SUBDIRS =. dma pci usb nics scsi interrupts devices xserver samba sound partitions memory pcmcia opengl processor ioports protocols
++SUBDIRS =. usb pci xserver opengl memory nics protocols samba ioports scsi devices processor dma interrupts pcmcia partitions sound
  KDE_LANG = en
  KDE_DOCS = AUTO
  #>- all: all-recursive
-@@ -563,7 +566,7 @@
+@@ -563,7 +572,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -20697,7 +52288,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20711,7 +52302,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/memory/Makefile.in
 +++ doc/kinfocenter/memory/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20721,7 +52320,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20730,7 +52393,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20744,7 +52407,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/nics/Makefile.in
 +++ doc/kinfocenter/nics/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20754,7 +52425,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20763,7 +52498,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20777,7 +52512,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/opengl/Makefile.in
 +++ doc/kinfocenter/opengl/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20787,7 +52530,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20796,7 +52603,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20810,7 +52617,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/partitions/Makefile.in
 +++ doc/kinfocenter/partitions/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20820,7 +52635,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20829,7 +52708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20843,7 +52722,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/pci/Makefile.in
 +++ doc/kinfocenter/pci/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20853,7 +52740,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20862,7 +52813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20876,7 +52827,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/pcmcia/Makefile.in
 +++ doc/kinfocenter/pcmcia/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20886,7 +52845,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20895,7 +52918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20909,7 +52932,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/processor/Makefile.in
 +++ doc/kinfocenter/processor/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20919,7 +52950,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20928,7 +53023,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20942,7 +53037,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/protocols/Makefile.in
 +++ doc/kinfocenter/protocols/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20952,7 +53055,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20961,7 +53128,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20975,7 +53142,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/samba/Makefile.in
 +++ doc/kinfocenter/samba/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20985,7 +53160,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20994,7 +53233,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21008,7 +53247,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/scsi/Makefile.in
 +++ doc/kinfocenter/scsi/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21018,7 +53265,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21027,7 +53338,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21041,7 +53352,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/sound/Makefile.in
 +++ doc/kinfocenter/sound/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21051,7 +53370,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21060,7 +53443,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21074,7 +53457,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/usb/Makefile.in
 +++ doc/kinfocenter/usb/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21084,7 +53475,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21093,7 +53548,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21107,7 +53562,15 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/xserver/Makefile.in
 +++ doc/kinfocenter/xserver/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21117,7 +53580,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21126,7 +53653,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21140,7 +53667,15 @@
  mostlyclean-libtool:
 --- doc/kioslave/Makefile.in
 +++ doc/kioslave/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21150,7 +53685,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21159,7 +53758,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21171,32 +53770,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +732,10 @@
+@@ -729,10 +738,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=finger.docbook smtp.docbook pop3s.docbook bzip2.docbook imap.docbook file.docbook bzip.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook sftp.docbook thumbnail.docbook pop3.docbook index.docbook floppy.docbook print.docbook telnet.docbook http.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in man.docbook rlogin.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2 
-+KDE_DIST=finger.docbook pop3s.docbook smtp.docbook bzip2.docbook imap.docbook bzip.docbook file.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook index.docbook pop3.docbook floppy.docbook print.docbook http.docbook telnet.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in rlogin.docbook man.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2 
++KDE_DIST=finger.docbook smtp.docbook pop3s.docbook bzip2.docbook imap.docbook bzip.docbook file.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook pop3.docbook index.docbook floppy.docbook print.docbook http.docbook telnet.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in man.docbook rlogin.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.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 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
 -	@for base in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
-+	@for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
++	@for base in floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
-+	for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
++	for base in floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
  	done
  
@@ -21204,13 +53803,21 @@
  #>+ 5
  distdir-nls:
 -	for file in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
-+	for file in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
++	for file in floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/klipper/Makefile.in
 +++ doc/klipper/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21220,7 +53827,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21229,7 +53900,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21241,9 +53912,50 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -732,7 +741,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.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
+@@ -759,20 +768,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper
+-	@for base in screenshot.png index.docbook ; do \
++	@for base in index.docbook screenshot.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in screenshot.png index.docbook ; do \
++	for base in index.docbook screenshot.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in screenshot.png index.docbook ; do \
++	for file in index.docbook screenshot.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/kmenuedit/Makefile.in
 +++ doc/kmenuedit/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21253,7 +53965,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21262,7 +54038,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21274,28 +54050,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +735,7 @@
+@@ -732,7 +741,7 @@
  KDE_DIST=done.png new.png index.docbook selectinternet.png itemname.png Makefile.in kmenueditmain.png selecticon.png Makefile.am index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.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
-@@ -759,20 +762,20 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
 -	@for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
-+	@for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
++	@for base in done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
-+	for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
++	for base in done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
  	done
  
@@ -21303,13 +54079,21 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
-+	for file in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
++	for file in done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/knetattach/Makefile.in
 +++ doc/knetattach/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21319,7 +54103,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21328,7 +54176,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21340,9 +54188,50 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -732,7 +741,7 @@
+ KDE_DIST=screenshot.png screenshot4.png screenshot3.png index.docbook screenshot2.png Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.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
+@@ -759,20 +768,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach
+-	@for base in screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook ; do \
++	@for base in screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook ; do \
++	for base in screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook ; do \
++	for file in screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/kompmgr/Makefile.in
 +++ doc/kompmgr/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21352,7 +54241,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21361,7 +54314,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21375,7 +54328,15 @@
  mostlyclean-libtool:
 --- doc/konqueror/Makefile.in
 +++ doc/konqueror/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21385,7 +54346,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21394,7 +54419,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21406,32 +54431,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -730,10 +733,10 @@
- .NOEXPORT:
+@@ -733,7 +742,7 @@
+ KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png man-kbookmarkmerger.1.docbook introduction.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am index.cache.bz2 filemanager.docbook 
  
- #>+ 2
--KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png man-kbookmarkmerger.1.docbook introduction.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am index.cache.bz2 filemanager.docbook 
-+KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png introduction.docbook man-kbookmarkmerger.1.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am filemanager.docbook index.cache.bz2 
- 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.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
-@@ -760,20 +763,20 @@
+@@ -760,20 +769,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
 -	@for base in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
-+	@for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
++	@for base in path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
-+	for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
++	for base in path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
  	done
  
@@ -21439,13 +54460,21 @@
  #>+ 5
  distdir-nls:
 -	for file in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
-+	for file in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
++	for file in path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/konsole/Makefile.in
 +++ doc/konsole/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21455,7 +54484,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21464,7 +54557,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21476,42 +54569,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +735,7 @@
- KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook konsole.png tabbar.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konsole.png index.docbook tabbar.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
-@@ -759,20 +762,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
--	@for base in index.docbook konsole.png tabbar.png ; do \
-+	@for base in konsole.png index.docbook tabbar.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook konsole.png tabbar.png ; do \
-+	for base in konsole.png index.docbook tabbar.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook konsole.png tabbar.png ; do \
-+	for file in konsole.png index.docbook tabbar.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kpager/Makefile.in
 +++ doc/kpager/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21521,7 +54589,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21530,7 +54662,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21542,9 +54674,50 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -732,7 +741,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in settings.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png settings.png index.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) settings.png index.docbook screenshot.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
+@@ -759,20 +768,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager
+-	@for base in screenshot.png settings.png index.docbook ; do \
++	@for base in settings.png index.docbook screenshot.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in screenshot.png settings.png index.docbook ; do \
++	for base in settings.png index.docbook screenshot.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in screenshot.png settings.png index.docbook ; do \
++	for file in settings.png index.docbook screenshot.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/ksplashml/Makefile.in
 +++ doc/ksplashml/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21554,7 +54727,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21563,7 +54800,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21577,7 +54814,15 @@
  mostlyclean-libtool:
 --- doc/ksysguard/Makefile.in
 +++ doc/ksysguard/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21587,7 +54832,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21596,7 +54905,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21610,7 +54919,15 @@
  mostlyclean-libtool:
 --- doc/kwrite/Makefile.in
 +++ doc/kwrite/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21620,7 +54937,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21629,7 +55010,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21643,7 +55024,15 @@
  mostlyclean-libtool:
 --- doc/kxkb/Makefile.in
 +++ doc/kxkb/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21653,7 +55042,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21662,7 +55115,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21674,7 +55127,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +732,10 @@
+@@ -729,10 +738,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -21683,23 +55136,23 @@
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook layout.png switching.png xkb.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) xkb.png layout.png index.docbook switching.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook layout.png xkb.png switching.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
-@@ -759,20 +762,20 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb
 -	@for base in index.docbook layout.png switching.png xkb.png ; do \
-+	@for base in xkb.png layout.png index.docbook switching.png ; do \
++	@for base in index.docbook layout.png xkb.png switching.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook layout.png switching.png xkb.png ; do \
-+	for base in xkb.png layout.png index.docbook switching.png ; do \
++	for base in index.docbook layout.png xkb.png switching.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
  	done
  
@@ -21707,13 +55160,21 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook layout.png switching.png xkb.png ; do \
-+	for file in xkb.png layout.png index.docbook switching.png ; do \
++	for file in index.docbook layout.png xkb.png switching.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/Makefile.in
 +++ doc/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21723,12 +55184,76 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,13 +560,13 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -557,13 +566,13 @@
  KDE_DOCS = AUTO
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
 -SUBDIRS =. kdeprint kdebugdialog kappfinder kate kmenuedit konqueror knetattach quickstart kfind kcontrol userguide ksplashml kxkb kdcop glossary khelpcenter kwrite klipper kinfocenter faq visualdict kicker kpager konsole kdm kdesu kompmgr ksysguard kioslave
-+SUBDIRS =. faq kdm kate kxkb ksysguard quickstart kdcop kdesu kfind klipper kappfinder kompmgr konsole khelpcenter kmenuedit kioslave knetattach glossary kcontrol kdeprint kicker kpager kwrite ksplashml kdebugdialog kinfocenter userguide konqueror visualdict
++SUBDIRS =. kpager kxkb userguide kappfinder faq konqueror kicker ksysguard konsole kate kompmgr khelpcenter kioslave kinfocenter kdebugdialog visualdict kwrite quickstart ksplashml kdesu kdm knetattach kcontrol kdcop klipper kdeprint kfind glossary kmenuedit
  #>- all: all-recursive
  #>+ 1
  all: docs-am  all-recursive
@@ -21739,7 +55264,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21753,7 +55278,15 @@
  mostlyclean-libtool:
 --- doc/quickstart/Makefile.in
 +++ doc/quickstart/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21763,7 +55296,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21772,7 +55369,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21786,7 +55383,15 @@
  mostlyclean-libtool:
 --- doc/userguide/Makefile.in
 +++ doc/userguide/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21796,7 +55401,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21805,7 +55474,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21817,32 +55486,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +732,10 @@
+@@ -729,10 +738,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook juk-icon.png amarok-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png oggfolder.png removable-disks.docbook getting-help.docbook noatun.png kmouth2.png knode-news-account.png font-installation.docbook extragear-applications.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png playing-movies.docbook file-sharing.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
-+KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png knode-news-account.png kmouth2.png extragear-applications.docbook font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook kppp-dialer-tab.png printer-setup.docbook under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
++KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png juk-icon.png amarok-icon.png kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png extragear-applications.docbook font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook knode-identity.png knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.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 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
 -	@for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
-+	@for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
++	@for base in kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
-+	for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
++	for base in kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
  	done
  
@@ -21850,13 +55519,21 @@
  #>+ 5
  distdir-nls:
 -	for file in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
-+	for file in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
++	for file in kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/visualdict/Makefile.in
 +++ doc/visualdict/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21866,7 +55543,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21875,7 +55616,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21887,32 +55628,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +732,10 @@
- .NOEXPORT:
+@@ -732,7 +741,7 @@
+ KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png contextmenu.png Makefile.am 
  
- #>+ 2
--KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png contextmenu.png Makefile.am 
-+KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict13.png pict3.png contextmenu.png Makefile.am 
- 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.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
-@@ -759,20 +762,20 @@
+@@ -759,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
 -	@for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+	@for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
++	@for base in pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+	for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
++	for base in pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
  	done
  
@@ -21920,13 +55657,21 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+	for file in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
++	for file in pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- drkonqi/debuggers/Makefile.in
 +++ drkonqi/debuggers/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21936,7 +55681,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21945,7 +55754,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21959,7 +55768,15 @@
  mostlyclean-libtool:
 --- drkonqi/Makefile.in
 +++ drkonqi/Makefile.in
-@@ -315,6 +315,9 @@
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -315,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21969,7 +55786,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -365,6 +369,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -372,12 +377,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -398,10 +400,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -410,6 +415,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -571,6 +577,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -578,10 +585,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -623,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21978,7 +55859,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +664,9 @@
+@@ -661,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21990,9 +55871,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
+@@ -1040,6 +1049,13 @@
+ .NOEXPORT:
+ 
+ #>+ 3
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++
++#>+ 2
++mocs: toplevel.moc
++
++#>+ 3
+ debugger.moc: $(srcdir)/debugger.h
+ 	$(MOC) $(srcdir)/debugger.h -o debugger.moc
+ 
+@@ -1054,13 +1070,6 @@
+ mocs: backtrace.moc
+ 
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+-
+-#>+ 2
+-mocs: toplevel.moc
+-
+-#>+ 3
+ drbugreport.moc: $(srcdir)/drbugreport.h
+ 	$(MOC) $(srcdir)/drbugreport.h -o drbugreport.moc
+ 
+@@ -1082,7 +1091,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  debugger.moc backtrace.moc toplevel.moc drbugreport.moc krashconf.moc
++	-rm -f  toplevel.moc debugger.moc backtrace.moc drbugreport.moc krashconf.moc
+ 
+ #>+ 2
+ KDE_DIST=backtrace.h toplevel.h drbugreport.h Makefile.in krashdcopinterface.h krashconf.h debugger.h Makefile.am 
+@@ -1134,7 +1143,7 @@
+ 
+ 
+ #>+ 11
+-drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp  toplevel.moc backtrace.moc debugger.moc drbugreport.moc krashconf.moc
++drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp  backtrace.moc debugger.moc toplevel.moc drbugreport.moc krashconf.moc
+ 	@echo 'creating drkonqi.all_cpp.cpp ...'; \
+ 	rm -f drkonqi.all_cpp.files drkonqi.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> drkonqi.all_cpp.final; \
 --- drkonqi/pics/Makefile.in
 +++ drkonqi/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22002,7 +55937,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22011,7 +56010,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22025,7 +56024,15 @@
  mostlyclean-libtool:
 --- drkonqi/presets/Makefile.in
 +++ drkonqi/presets/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22035,7 +56042,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22044,7 +56115,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22058,7 +56129,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Development/Makefile.in
 +++ kappfinder/apps/Development/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22068,7 +56147,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -557,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22077,7 +56220,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22091,7 +56234,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Arcade/Makefile.in
 +++ kappfinder/apps/Games/Arcade/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22101,7 +56252,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22110,7 +56325,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22124,7 +56339,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Board/Makefile.in
 +++ kappfinder/apps/Games/Board/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22134,7 +56357,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22143,7 +56430,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22155,9 +56442,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -760,7 +769,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Glines.desktop Gataxx.desktop xboard.desktop Gmines.desktop Gmahjongg.desktop Gnotravex.desktop Iagno.desktop Xgammon.desktop Gchess.desktop SameGnome.desktop Gstones.desktop Makefile.in Gnotski.desktop Makefile.am 
++KDE_DIST=Glines.desktop Gataxx.desktop xboard.desktop Gmahjongg.desktop Gmines.desktop Gnotravex.desktop Iagno.desktop Xgammon.desktop Gchess.desktop SameGnome.desktop Gstones.desktop Makefile.in Gnotski.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- kappfinder/apps/Games/Card/Makefile.in
 +++ kappfinder/apps/Games/Card/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22167,7 +56471,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22176,7 +56544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22190,7 +56558,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Emulators/Makefile.in
 +++ kappfinder/apps/Games/Emulators/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22200,7 +56576,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22209,7 +56649,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22223,7 +56663,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Makefile.in
 +++ kappfinder/apps/Games/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22233,7 +56681,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -574,7 +583,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22242,7 +56754,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22256,7 +56768,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Roguelikes/Makefile.in
 +++ kappfinder/apps/Games/Roguelikes/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22266,7 +56786,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -557,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22275,7 +56859,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22289,7 +56873,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/TacticStrategy/Makefile.in
 +++ kappfinder/apps/Games/TacticStrategy/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22299,7 +56891,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22308,7 +56964,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22322,7 +56978,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Toys/Makefile.in
 +++ kappfinder/apps/Games/Toys/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22332,7 +56996,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22341,7 +57069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22355,7 +57083,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Graphics/Makefile.in
 +++ kappfinder/apps/Graphics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22365,7 +57101,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -561,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22374,7 +57174,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22386,9 +57186,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -761,7 +770,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=GnomeIconEditor.desktop GnomeColorSelector.desktop xdvi.desktop tgif.desktop xfig.desktop Sketch.desktop GPhoto.desktop gv.desktop xpaint.desktop gimp.desktop bitmap.desktop blender.desktop inkscape.desktop Xwpick.desktop Gqview.desktop Makefile.in Xpcd.desktop ElectricEyes.desktop ghostview.desktop Makefile.am xv.desktop sodipodi.desktop 
++KDE_DIST=GnomeIconEditor.desktop GnomeColorSelector.desktop xdvi.desktop tgif.desktop xfig.desktop Sketch.desktop GPhoto.desktop gv.desktop xpaint.desktop gimp.desktop bitmap.desktop blender.desktop inkscape.desktop Xwpick.desktop Gqview.desktop Makefile.in Xpcd.desktop ElectricEyes.desktop ghostview.desktop Makefile.am sodipodi.desktop xv.desktop 
+ 
+ #>+ 2
+ docs-am:
 --- kappfinder/apps/Internet/Makefile.in
 +++ kappfinder/apps/Internet/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22398,7 +57215,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22407,7 +57288,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22419,18 +57300,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -933,7 +936,7 @@
+@@ -933,7 +942,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop gtelnet.desktop xftp.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop 
-+KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop gnometalk.desktop ickle.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop btdownloadgui.desktop Makefile.in BlueFish.desktop GnomeICU.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop 
++KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop Sylpheed.desktop licq.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop 
  
  #>+ 2
  docs-am:
 --- kappfinder/apps/Internet/Terminal/Makefile.in
 +++ kappfinder/apps/Internet/Terminal/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22440,7 +57329,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22449,7 +57402,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22463,7 +57416,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Makefile.in
 +++ kappfinder/apps/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22473,7 +57434,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -561,7 +570,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22482,7 +57507,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22496,7 +57521,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Multimedia/Makefile.in
 +++ kappfinder/apps/Multimedia/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22506,7 +57539,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22515,7 +57612,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22527,18 +57624,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -783,7 +786,7 @@
+@@ -783,7 +792,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=bcast2000.desktop XMovie.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
-+KDE_DIST=XMovie.desktop bcast2000.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
++KDE_DIST=bcast2000.desktop XMovie.desktop xcam.desktop ogle.desktop alsamixergui.desktop alevt.desktop slab.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
  
  #>+ 2
  docs-am:
 --- kappfinder/apps/Office/Makefile.in
 +++ kappfinder/apps/Office/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22548,7 +57653,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -562,7 +571,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22557,7 +57726,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22569,18 +57738,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -762,7 +765,7 @@
+@@ -762,7 +771,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop pybliographic.desktop gnucash.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop lyx.desktop acroread.desktop Makefile.in mrproject.desktop scribus.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
-+KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop gnucash.desktop pybliographic.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop acroread.desktop lyx.desktop Makefile.in scribus.desktop mrproject.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
++KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop gnucash.desktop pybliographic.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop lyx.desktop acroread.desktop Makefile.in mrproject.desktop scribus.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
  
  #>+ 2
  docs-am:
 --- kappfinder/apps/System/Makefile.in
 +++ kappfinder/apps/System/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22590,7 +57767,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -574,7 +583,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22599,7 +57840,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22613,7 +57854,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/System/Terminal/Makefile.in
 +++ kappfinder/apps/System/Terminal/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22623,7 +57872,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22632,7 +57945,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22646,7 +57959,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/Editors/Makefile.in
 +++ kappfinder/apps/Utilities/Editors/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22656,7 +57977,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22665,7 +58050,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22677,9 +58062,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -758,7 +767,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=gedit.desktop nano.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am 
++KDE_DIST=nano.desktop gedit.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- kappfinder/apps/Utilities/Makefile.in
 +++ kappfinder/apps/Utilities/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22689,7 +58091,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -574,7 +583,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -22698,7 +58164,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22712,7 +58178,15 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/xutils/Makefile.in
 +++ kappfinder/apps/Utilities/xutils/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22722,7 +58196,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22731,7 +58269,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22745,7 +58283,15 @@
  mostlyclean-libtool:
 --- kappfinder/Makefile.in
 +++ kappfinder/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -324,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22755,7 +58301,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -374,6 +378,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -381,12 +386,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,10 +409,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -580,6 +586,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -587,10 +594,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -627,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22764,7 +58374,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -665,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22776,45 +58386,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1095,26 +1098,26 @@
+@@ -1095,25 +1104,25 @@
  
  #>+ 22
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
  
  #>+ 15
- force-reedit:
 --- kate/app/Makefile.in
 +++ kate/app/Makefile.in
-@@ -348,6 +348,9 @@
+@@ -204,6 +204,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -348,6 +349,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22824,7 +58441,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -680,7 +683,7 @@
+@@ -398,6 +402,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -405,12 +410,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -431,10 +433,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -604,6 +610,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -611,10 +618,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -680,7 +689,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22833,7 +58514,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -718,9 +721,9 @@
+@@ -718,9 +727,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22845,9 +58526,70 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -1197,18 +1206,18 @@
+ mocs: katemwmodonhddialog.moc
+ 
+ #>+ 3
+-katepluginmanager.moc: $(srcdir)/katepluginmanager.h
+-	$(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
++kateexternaltools.moc: $(srcdir)/kateexternaltools.h
++	$(MOC) $(srcdir)/kateexternaltools.h -o kateexternaltools.moc
+ 
+ #>+ 2
+-mocs: katepluginmanager.moc
++mocs: kateexternaltools.moc
+ 
+ #>+ 3
+-kateexternaltools.moc: $(srcdir)/kateexternaltools.h
+-	$(MOC) $(srcdir)/kateexternaltools.h -o kateexternaltools.moc
++katepluginmanager.moc: $(srcdir)/katepluginmanager.h
++	$(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
+ 
+ #>+ 2
+-mocs: kateexternaltools.moc
++mocs: katepluginmanager.moc
+ 
+ #>+ 3
+ katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h
+@@ -1291,7 +1300,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc katetabwidget.moc kateviewspacecontainer.moc katesession.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
++	-rm -f  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc katetabwidget.moc kateviewspacecontainer.moc katesession.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
+ 
+ #>+ 2
+ KDE_DIST=katepluginmanager.h katefileselector.h katemdi.h kateviewspace.h katemainwindowiface.h kateexternaltools.h katedocmanageriface.h kateconfigdialog.h kateviewspacecontainer.h kwritemain.h katefilelist.h kateconsole.h katemailfilesdialog.h kateapp.h katesession.h katedocmanager.h katemain.h kateconfigplugindialogpage.h kateappIface.h Makefile.in katemainwindow.h katetabwidget.h kbookmarkhandler.h kateviewmanager.h katemwmodonhddialog.h Makefile.am katesavemodifieddialog.h kategrepdialog.h 
+@@ -1349,7 +1358,7 @@
+ 
+ 
+ #>+ 11
+-libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp $(srcdir)/katesession.cpp $(srcdir)/katemdi.cpp $(srcdir)/katetabwidget.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc katetabwidget.moc katesession.moc kateviewspacecontainer.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
++libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp $(srcdir)/katesession.cpp $(srcdir)/katemdi.cpp $(srcdir)/katetabwidget.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc katetabwidget.moc katesession.moc kateviewspacecontainer.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
+ 	@echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \
+ 	rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
+@@ -1451,8 +1460,8 @@
+ katemwmodonhddialog.o: katemwmodonhddialog.moc 
+ katemailfilesdialog.lo: katemailfilesdialog.moc 
+ katefilelist.lo: katefilelist.moc 
+-katepluginmanager.o: katepluginmanager.moc 
+ kateexternaltools.lo: kateexternaltools.moc 
++katepluginmanager.o: katepluginmanager.moc 
+ kateviewspace.o: kateviewspace.moc 
+ kateviewspace.lo: kateviewspace.moc 
+ kateapp.lo: kateapp.moc 
 --- kate/data/Makefile.in
 +++ kate/data/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -128,6 +128,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -272,6 +273,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22857,7 +58599,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -322,6 +326,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -329,12 +334,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -355,10 +357,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -367,6 +372,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -528,6 +534,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -535,10 +542,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22866,7 +58672,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22880,7 +58686,15 @@
  mostlyclean-libtool:
 --- kate/interfaces/Makefile.in
 +++ kate/interfaces/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22890,7 +58704,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22899,7 +58777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22911,7 +58789,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -902,6 +905,13 @@
+@@ -902,6 +911,13 @@
  .NOEXPORT:
  
  #>+ 3
@@ -22925,7 +58803,7 @@
  documentmanager.moc: $(srcdir)/documentmanager.h
  	$(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
  
-@@ -909,39 +919,39 @@
+@@ -909,39 +925,39 @@
  mocs: documentmanager.moc
  
  #>+ 3
@@ -22961,26 +58839,26 @@
  #>+ 3
 -pluginconfiginterfaceextension.moc: $(srcdir)/pluginconfiginterfaceextension.h
 -	$(MOC) $(srcdir)/pluginconfiginterfaceextension.h -o pluginconfiginterfaceextension.moc
-+mainwindow.moc: $(srcdir)/mainwindow.h
-+	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
++toolviewmanager.moc: $(srcdir)/toolviewmanager.h
++	$(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
  
  #>+ 2
 -mocs: pluginconfiginterfaceextension.moc
-+mocs: mainwindow.moc
++mocs: toolviewmanager.moc
  
  #>+ 3
 -application.moc: $(srcdir)/application.h
 -	$(MOC) $(srcdir)/application.h -o application.moc
-+toolviewmanager.moc: $(srcdir)/toolviewmanager.h
-+	$(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
++mainwindow.moc: $(srcdir)/mainwindow.h
++	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
  
  #>+ 2
 -mocs: application.moc
-+mocs: toolviewmanager.moc
++mocs: mainwindow.moc
  
  #>+ 3
  viewmanager.moc: $(srcdir)/viewmanager.h
-@@ -951,15 +961,8 @@
+@@ -951,15 +967,8 @@
  mocs: viewmanager.moc
  
  #>+ 3
@@ -22993,20 +58871,20 @@
 -#>+ 3
  clean-metasources:
 -	-rm -f  documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
-+	-rm -f  plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
++	-rm -f  plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc toolviewmanager.moc mainwindow.moc viewmanager.moc
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-@@ -1006,7 +1009,7 @@
+@@ -1006,7 +1015,7 @@
  
  
  #>+ 11
 -libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp  plugin.moc documentmanager.moc mainwindow.moc toolviewmanager.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
-+libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp  documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
++libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp  documentmanager.moc plugin.moc mainwindow.moc toolviewmanager.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
  	@echo 'creating libkateinterfacesprivate_la.all_cpp.cpp ...'; \
  	rm -f libkateinterfacesprivate_la.all_cpp.files libkateinterfacesprivate_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkateinterfacesprivate_la.all_cpp.final; \
-@@ -1044,15 +1047,15 @@
+@@ -1044,15 +1053,15 @@
  #>+ 19
  documentmanager.o: documentmanager.moc 
  toolviewmanager.o: toolviewmanager.moc 
@@ -23026,7 +58904,15 @@
  plugin.o: plugin.moc 
 --- kate/Makefile.in
 +++ kate/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -125,6 +125,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -269,6 +270,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23036,7 +58922,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -319,6 +323,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -326,12 +331,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,10 +354,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -364,6 +369,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -525,6 +531,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -532,10 +539,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -562,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23045,7 +58995,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23059,7 +59009,15 @@
  mostlyclean-libtool:
 --- kate/pics/actions/Makefile.in
 +++ kate/pics/actions/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23069,7 +59027,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23078,7 +59100,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23090,87 +59112,88 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,51 +730,51 @@
+@@ -727,51 +736,51 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-curfiledir.png cr16-action-modmod.png Makefile.in cr16-action-modified.png lo16-action-modonhd.png lo22-action-indent.png cr16-action-highlighting.png Makefile.am 
-+KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-modmod.png cr16-action-curfiledir.png Makefile.in cr16-action-modified.png lo22-action-indent.png lo16-action-modonhd.png cr16-action-highlighting.png Makefile.am 
++KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-curfiledir.png cr16-action-modmod.png Makefile.in cr16-action-modified.png lo22-action-indent.png lo16-action-modonhd.png cr16-action-highlighting.png Makefile.am 
  
  #>+ 2
  docs-am:
  
  #>+ 40
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
- 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
++	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+-	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
--	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
 -	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
--	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
 -	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
 -	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
  	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions
  	$(INSTALL_DATA) $(srcdir)/cr32-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
-+	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
-+	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
  	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
  	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
--	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
  	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
--	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
--	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
  	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
--	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
- 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
  
  #>+ 15
  force-reedit:
 --- kate/pics/Makefile.in
 +++ kate/pics/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23180,7 +59203,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23189,7 +59276,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23201,49 +59288,48 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -931,43 +934,43 @@
+@@ -931,43 +940,43 @@
  
  #>+ 39
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
 +	$(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
 -	$(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++	$(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
  	$(INSTALL_DATA) $(srcdir)/hi128-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
@@ -23252,27 +59338,33 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
  
  #>+ 15
  force-reedit:
 --- kate/utils/Makefile.in
 +++ kate/utils/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23282,7 +59374,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23291,7 +59447,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23305,7 +59461,15 @@
  	@$(NORMAL_INSTALL)
 --- kcheckpass/Makefile.in
 +++ kcheckpass/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -287,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23315,7 +59479,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -337,6 +341,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -344,12 +349,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -370,10 +372,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -382,6 +387,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -543,6 +549,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -550,10 +557,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -23324,7 +59552,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23338,7 +59566,15 @@
  	@$(NORMAL_INSTALL)
 --- kcminit/Makefile.in
 +++ kcminit/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -192,6 +192,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -336,6 +337,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23348,7 +59584,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -386,6 +390,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -393,12 +398,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -419,10 +421,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -592,6 +598,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -599,10 +606,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -650,7 +659,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23357,7 +59657,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -688,9 +697,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23371,7 +59671,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/access/Makefile.in
 +++ kcontrol/access/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -324,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23381,7 +59689,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -374,6 +378,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -381,12 +386,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,10 +409,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -580,6 +586,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -587,10 +594,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -639,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23390,7 +59762,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -677,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23404,7 +59776,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/accessibility/Makefile.in
 +++ kcontrol/accessibility/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23414,7 +59794,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23423,7 +59867,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23437,7 +59881,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/arts/Makefile.in
 +++ kcontrol/arts/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23447,7 +59899,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23456,7 +59972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23470,7 +59986,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/background/Makefile.in
 +++ kcontrol/background/Makefile.in
-@@ -332,6 +332,9 @@
+@@ -188,6 +188,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -332,6 +333,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23480,7 +60004,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -646,7 +649,7 @@
+@@ -382,6 +386,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -389,12 +394,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,10 +417,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -588,6 +594,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -595,10 +602,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -646,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23489,7 +60077,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -684,9 +687,9 @@
+@@ -684,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23501,41 +60089,59 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1102,18 +1105,18 @@
+@@ -1102,13 +1111,6 @@
  
  
  #>+ 3
 -bgrender.moc: $(srcdir)/bgrender.h
 -	$(MOC) $(srcdir)/bgrender.h -o bgrender.moc
-+bgwallpaper.moc: $(srcdir)/bgwallpaper.h
-+	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: bgrender.moc
-+mocs: bgwallpaper.moc
+-
+-#>+ 3
+ bgwallpaper.moc: $(srcdir)/bgwallpaper.h
+ 	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
  
+@@ -1116,11 +1118,11 @@
+ mocs: bgwallpaper.moc
+ 
  #>+ 3
--bgwallpaper.moc: $(srcdir)/bgwallpaper.h
--	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
+-bgadvanced.moc: $(srcdir)/bgadvanced.h
+-	$(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
 +bgrender.moc: $(srcdir)/bgrender.h
 +	$(MOC) $(srcdir)/bgrender.h -o bgrender.moc
  
  #>+ 2
--mocs: bgwallpaper.moc
+-mocs: bgadvanced.moc
 +mocs: bgrender.moc
  
  #>+ 3
- bgadvanced.moc: $(srcdir)/bgadvanced.h
-@@ -1145,7 +1148,7 @@
+ bgmonitor.moc: $(srcdir)/bgmonitor.h
+@@ -1130,6 +1132,13 @@
+ mocs: bgmonitor.moc
  
  #>+ 3
++bgadvanced.moc: $(srcdir)/bgadvanced.h
++	$(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
++
++#>+ 2
++mocs: bgadvanced.moc
++
++#>+ 3
+ bgdialog.moc: $(srcdir)/bgdialog.h
+ 	$(MOC) $(srcdir)/bgdialog.h -o bgdialog.moc
+ 
+@@ -1145,7 +1154,7 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  bgrender.moc bgwallpaper.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
-+	-rm -f  bgwallpaper.moc bgrender.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
++	-rm -f  bgwallpaper.moc bgrender.moc bgmonitor.moc bgadvanced.moc bgdialog.moc main.moc
  
  #>+ 2
  KDE_DIST=background.desktop bgwallpaper_ui.ui bghash.h bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am 
-@@ -1264,8 +1267,8 @@
+@@ -1264,8 +1273,8 @@
  $(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h 
  bgdialog.lo: bgdialog.moc 
  nmcheck: 
@@ -23547,7 +60153,15 @@
  
 --- kcontrol/background/pics/Makefile.in
 +++ kcontrol/background/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23557,7 +60171,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23566,7 +60244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23580,7 +60258,15 @@
  mostlyclean-libtool:
 --- kcontrol/bell/Makefile.in
 +++ kcontrol/bell/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -293,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23590,7 +60276,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -343,6 +347,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -350,12 +355,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,10 +378,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -388,6 +393,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -549,6 +555,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -556,10 +563,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23599,7 +60349,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23613,7 +60363,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/clock/Makefile.in
 +++ kcontrol/clock/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23623,7 +60381,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23632,7 +60454,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23644,7 +60466,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -929,18 +932,18 @@
+@@ -929,18 +938,18 @@
  
  
  #>+ 3
@@ -23669,7 +60491,7 @@
  
  #>+ 3
  main.moc: $(srcdir)/main.h
-@@ -951,7 +954,7 @@
+@@ -951,7 +960,7 @@
  
  #>+ 3
  clean-metasources:
@@ -23678,7 +60500,7 @@
  
  #>+ 2
  KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am 
-@@ -1002,7 +1005,7 @@
+@@ -1002,7 +1011,7 @@
  
  
  #>+ 11
@@ -23687,7 +60509,7 @@
  	@echo 'creating kcm_clock_la.all_cpp.cpp ...'; \
  	rm -f kcm_clock_la.all_cpp.files kcm_clock_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_clock_la.all_cpp.final; \
-@@ -1044,5 +1047,5 @@
+@@ -1044,5 +1053,5 @@
  nmcheck-am: nmcheck
  dtime.lo: dtime.moc 
  main.o: main.moc 
@@ -23696,7 +60518,15 @@
 +dtime.o: dtime.moc 
 --- kcontrol/colors/Makefile.in
 +++ kcontrol/colors/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23706,7 +60536,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23715,7 +60609,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23729,7 +60623,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/componentchooser/componentservices/Makefile.in
 +++ kcontrol/componentchooser/componentservices/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23739,7 +60641,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23748,7 +60714,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23762,7 +60728,15 @@
  mostlyclean-libtool:
 --- kcontrol/componentchooser/Makefile.in
 +++ kcontrol/componentchooser/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -314,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23772,7 +60746,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -364,6 +368,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -371,12 +376,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -397,10 +399,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -409,6 +414,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -570,6 +576,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -577,10 +584,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -618,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23781,7 +60819,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -656,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23793,18 +60831,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1070,7 +1073,7 @@
- 	-rm -f  componentchooser.moc kcm_componentchooser.moc
- 
- #>+ 2
--KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui Makefile.in componentchooser.desktop Makefile.am componentchooser.h 
-+KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui componentchooser.desktop Makefile.in Makefile.am componentchooser.h 
- 
- #>+ 8
- clean-ui:
 --- kcontrol/crypto/Makefile.in
 +++ kcontrol/crypto/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23814,7 +60851,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23823,7 +60924,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23835,52 +60936,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -935,18 +938,18 @@
- 
- 
- #>+ 3
--crypto.moc: $(srcdir)/crypto.h
--	$(MOC) $(srcdir)/crypto.h -o crypto.moc
-+kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
-+	$(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
- 
- #>+ 2
--mocs: crypto.moc
-+mocs: kdatetimedlg.moc
- 
- #>+ 3
--kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
--	$(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
-+crypto.moc: $(srcdir)/crypto.h
-+	$(MOC) $(srcdir)/crypto.h -o crypto.moc
- 
- #>+ 2
--mocs: kdatetimedlg.moc
-+mocs: crypto.moc
- 
- #>+ 3
- certexport.moc: $(srcdir)/certexport.h
-@@ -957,7 +960,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  crypto.moc kdatetimedlg.moc certexport.moc
-+	-rm -f  kdatetimedlg.moc crypto.moc certexport.moc
- 
- #>+ 2
- KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am 
-@@ -1008,7 +1011,7 @@
- 
- 
- #>+ 11
--kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp  kdatetimedlg.moc crypto.moc certexport.moc
-+kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp  crypto.moc kdatetimedlg.moc certexport.moc
- 	@echo 'creating kcm_crypto_la.all_cpp.cpp ...'; \
- 	rm -f kcm_crypto_la.all_cpp.files kcm_crypto_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
 --- kcontrol/css/Makefile.in
 +++ kcontrol/css/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23890,7 +60956,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23899,7 +61029,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23913,7 +61043,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/display/Makefile.in
 +++ kcontrol/display/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23923,7 +61061,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23932,7 +61134,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23946,7 +61148,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/dnssd/Makefile.in
 +++ kcontrol/dnssd/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -306,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23956,7 +61166,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -356,6 +360,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -363,12 +368,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,10 +391,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -562,6 +568,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -569,10 +576,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -609,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23965,7 +61239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -647,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23979,7 +61253,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/ebrowsing/Makefile.in
 +++ kcontrol/ebrowsing/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -311,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23989,7 +61271,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -361,6 +365,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -368,12 +373,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -394,10 +396,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -406,6 +411,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -567,6 +573,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -574,10 +581,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23998,7 +61344,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24012,7 +61358,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/ebrowsing/plugins/ikws/Makefile.in
 +++ kcontrol/ebrowsing/plugins/ikws/Makefile.in
-@@ -332,6 +332,9 @@
+@@ -188,6 +188,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -332,6 +333,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24022,7 +61376,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -652,7 +655,7 @@
+@@ -382,6 +386,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -389,12 +394,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,10 +417,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -588,6 +594,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -595,10 +602,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -652,7 +661,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24031,7 +61449,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +693,9 @@
+@@ -690,9 +699,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24045,7 +61463,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
 +++ kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24055,7 +61481,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -644,7 +653,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24064,7 +61554,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -682,9 +691,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24076,18 +61566,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -844,7 +847,7 @@
+@@ -844,7 +853,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=kde.desktop leo.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop qt3.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop en2fr.desktop acronym.desktop google.desktop fsd.desktop nl-teletekst.desktop webster.desktop katatudo.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop cia.desktop alltheweb.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop feedster.desktop foldoc.desktop en2de.desktop google_news.desktop dbug.desktop wiktionary.desktop qt.desktop kde_websvn.desktop technorati.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop metacrawler.desktop excite.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop 
-+KDE_DIST=leo.desktop kde.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop qt3.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop google.desktop acronym.desktop en2fr.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop nl-telephone.desktop php.desktop foldoc.desktop feedster.desktop en2de.desktop dbug.desktop wiktionary.desktop google_news.desktop qt.desktop kde_websvn.desktop rfc.desktop technorati.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop excite.desktop metacrawler.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop 
++KDE_DIST=kde.desktop leo.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop qt3.desktop austronaut.desktop docbook.desktop deb.desktop jeeves.desktop google_lucky.desktop msdn.desktop technoratitags.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop en2fr.desktop acronym.desktop google.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop en2de.desktop foldoc.desktop feedster.desktop wiktionary.desktop dbug.desktop google_news.desktop qt.desktop kde_websvn.desktop rfc.desktop technorati.desktop Makefile.in citeseer.desktop rae.desktop backports.desktop excite.desktop fr2en.desktop metacrawler.desktop ctan.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop appsy.desktop hyperdictionary_thesaurus.desktop Makefile.am amg.desktop 
  
  #>+ 2
  docs-am:
 --- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
 +++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-@@ -320,6 +320,9 @@
+@@ -176,6 +176,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -320,6 +321,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24097,7 +61595,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -370,6 +374,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -377,12 +382,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,10 +405,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -576,6 +582,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -583,10 +590,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -625,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -24106,7 +61668,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -663,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24120,7 +61682,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/ebrowsing/plugins/Makefile.in
 +++ kcontrol/ebrowsing/plugins/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24130,7 +61700,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24139,7 +61773,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24153,7 +61787,15 @@
  mostlyclean-libtool:
 --- kcontrol/ebrowsing/plugins/shorturi/Makefile.in
 +++ kcontrol/ebrowsing/plugins/shorturi/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24163,7 +61805,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24172,7 +61878,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24186,7 +61892,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/energy/Makefile.in
 +++ kcontrol/energy/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -168,6 +168,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -312,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24196,7 +61910,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -362,6 +366,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -369,12 +374,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -395,10 +397,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -568,6 +574,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -575,10 +582,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24205,7 +61983,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24219,7 +61997,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/energy/pics/Makefile.in
 +++ kcontrol/energy/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24229,7 +62015,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24238,7 +62088,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24252,7 +62102,15 @@
  mostlyclean-libtool:
 --- kcontrol/filetypes/Makefile.in
 +++ kcontrol/filetypes/Makefile.in
-@@ -320,6 +320,9 @@
+@@ -176,6 +176,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -320,6 +321,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24262,7 +62120,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -633,7 +636,7 @@
+@@ -370,6 +374,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -377,12 +382,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,10 +405,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -576,6 +582,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -583,10 +590,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -633,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24271,7 +62193,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +674,9 @@
+@@ -671,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24285,7 +62207,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/fonts/Makefile.in
 +++ kcontrol/fonts/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -304,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24295,7 +62225,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -354,6 +358,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -361,12 +366,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,10 +389,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -560,6 +566,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -567,10 +574,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24304,7 +62298,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24318,7 +62312,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/icons/Makefile.in
 +++ kcontrol/icons/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -306,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24328,7 +62330,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -356,6 +360,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -363,12 +368,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,10 +391,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -562,6 +568,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -569,10 +576,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24337,7 +62403,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24349,52 +62415,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -961,18 +964,18 @@
- 
- 
- #>+ 3
--iconthemes.moc: $(srcdir)/iconthemes.h
--	$(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
-+icons.moc: $(srcdir)/icons.h
-+	$(MOC) $(srcdir)/icons.h -o icons.moc
- 
- #>+ 2
--mocs: iconthemes.moc
-+mocs: icons.moc
- 
- #>+ 3
--icons.moc: $(srcdir)/icons.h
--	$(MOC) $(srcdir)/icons.h -o icons.moc
-+iconthemes.moc: $(srcdir)/iconthemes.h
-+	$(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
- 
- #>+ 2
--mocs: icons.moc
-+mocs: iconthemes.moc
- 
- #>+ 3
- main.moc: $(srcdir)/main.h
-@@ -983,7 +986,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  iconthemes.moc icons.moc main.moc
-+	-rm -f  icons.moc iconthemes.moc main.moc
- 
- #>+ 2
- KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am 
-@@ -1034,7 +1037,7 @@
- 
- 
- #>+ 11
--kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp  icons.moc iconthemes.moc main.moc
-+kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp  iconthemes.moc icons.moc main.moc
- 	@echo 'creating kcm_icons_la.all_cpp.cpp ...'; \
- 	rm -f kcm_icons_la.all_cpp.files kcm_icons_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
 --- kcontrol/info/Makefile.in
 +++ kcontrol/info/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24404,7 +62435,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24413,7 +62508,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24425,18 +62520,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -948,7 +951,7 @@
- 	-rm -f  memory.moc
- 
- #>+ 2
--KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp ioports.desktop memory_solaris.cpp info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_fbsd.cpp info_hpux.cpp info.h memory_tru64.cpp devices.desktop memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h 
-+KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp memory_solaris.cpp ioports.desktop info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_hpux.cpp info_fbsd.cpp info.h devices.desktop memory_tru64.cpp memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h 
- 
- #>+ 3
- clean-closures:
 --- kcontrol/input/core/Makefile.in
 +++ kcontrol/input/core/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -284,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24446,7 +62540,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -334,6 +338,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -341,12 +346,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,10 +369,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -379,6 +384,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -540,6 +546,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -547,10 +554,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -581,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24455,7 +62613,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24469,7 +62627,15 @@
  clean-noinstLTLIBRARIES:
 --- kcontrol/input/Makefile.in
 +++ kcontrol/input/Makefile.in
-@@ -329,6 +329,9 @@
+@@ -185,6 +185,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -329,6 +330,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24479,7 +62645,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -647,7 +650,7 @@
+@@ -379,6 +383,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -386,12 +391,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -412,10 +414,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -585,6 +591,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -592,10 +599,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -647,7 +656,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24488,7 +62718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -685,9 +688,9 @@
+@@ -685,9 +694,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24500,7 +62730,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1179,7 +1182,7 @@
+@@ -1179,7 +1188,7 @@
  	-rm -f  logitechmouse.moc mouse.moc
  
  #>+ 2
@@ -24511,7 +62741,15 @@
  clean-ui:
 --- kcontrol/input/pics/Makefile.in
 +++ kcontrol/input/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24521,7 +62759,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24530,7 +62832,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24544,7 +62846,15 @@
  mostlyclean-libtool:
 --- kcontrol/input/xcursor/Makefile.in
 +++ kcontrol/input/xcursor/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -143,6 +143,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -287,6 +288,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24554,7 +62864,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -337,6 +341,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -344,12 +349,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -370,10 +372,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -382,6 +387,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -543,6 +549,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -550,10 +557,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24563,7 +62937,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24577,7 +62951,15 @@
  clean-noinstLTLIBRARIES:
 --- kcontrol/ioslaveinfo/Makefile.in
 +++ kcontrol/ioslaveinfo/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24587,7 +62969,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24596,7 +63042,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24610,7 +63056,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/joystick/Makefile.in
 +++ kcontrol/joystick/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24620,7 +63074,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24629,7 +63147,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24643,7 +63161,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kcontrol/about/Makefile.in
 +++ kcontrol/kcontrol/about/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24653,7 +63179,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24662,7 +63252,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24676,7 +63266,15 @@
  mostlyclean-libtool:
 --- kcontrol/kcontrol/Makefile.in
 +++ kcontrol/kcontrol/Makefile.in
-@@ -350,6 +350,9 @@
+@@ -206,6 +206,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -350,6 +351,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24686,7 +63284,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -672,7 +675,7 @@
+@@ -400,6 +404,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -407,12 +412,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -433,10 +435,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -606,6 +612,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -613,10 +620,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -672,7 +681,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24695,7 +63357,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -710,9 +713,9 @@
+@@ -710,9 +719,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24707,40 +63369,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1257,6 +1260,13 @@
+@@ -1257,11 +1266,11 @@
  mocs: indexwidget.moc
  
  #>+ 3
+-dockcontainer.moc: $(srcdir)/dockcontainer.h
+-	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
 +moduleiconview.moc: $(srcdir)/moduleiconview.h
 +	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: dockcontainer.moc
 +mocs: moduleiconview.moc
-+
-+#>+ 3
- dockcontainer.moc: $(srcdir)/dockcontainer.h
- 	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
  
-@@ -1271,13 +1281,6 @@
+ #>+ 3
+ aboutwidget.moc: $(srcdir)/aboutwidget.h
+@@ -1271,11 +1280,11 @@
  mocs: aboutwidget.moc
  
  #>+ 3
 -moduleiconview.moc: $(srcdir)/moduleiconview.h
 -	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
--
--#>+ 2
++dockcontainer.moc: $(srcdir)/dockcontainer.h
++	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
+ 
+ #>+ 2
 -mocs: moduleiconview.moc
--
--#>+ 3
++mocs: dockcontainer.moc
+ 
+ #>+ 3
  proxywidget.moc: $(srcdir)/proxywidget.h
- 	$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
+@@ -1320,25 +1329,25 @@
+ mocs: modulemenu.moc
  
-@@ -1335,10 +1338,10 @@
+ #>+ 3
+-moduleIface.moc: $(srcdir)/moduleIface.h
+-	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
++searchwidget.moc: $(srcdir)/searchwidget.h
++	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
  
+ #>+ 2
+-mocs: moduleIface.moc
++mocs: searchwidget.moc
+ 
  #>+ 3
+-searchwidget.moc: $(srcdir)/searchwidget.h
+-	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
++moduleIface.moc: $(srcdir)/moduleIface.h
++	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
+ 
+ #>+ 2
+-mocs: searchwidget.moc
++mocs: moduleIface.moc
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
-+	-rm -f  indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
++	-rm -f  indexwidget.moc moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc searchwidget.moc moduleIface.moc
  
  #>+ 2
 -KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h cr64-app-kcontrol.png global.h modulemenu.cpp modulemenu.h kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h 
@@ -24748,51 +63433,51 @@
  
  #>+ 4
  clean-idl:
-@@ -1350,23 +1353,23 @@
+@@ -1350,21 +1359,21 @@
  
  #>+ 19
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
  	$(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/cr48-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
  
- #>+ 15
- force-reedit:
-@@ -1407,7 +1410,7 @@
+@@ -1407,7 +1416,7 @@
  
  
  #>+ 11
 -libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp  indexwidget.moc moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
-+libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp  indexwidget.moc aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
++libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp  indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc moduleIface.moc searchwidget.moc
  	@echo 'creating libkdeinit_kcontrol_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_kcontrol_la.all_cpp.files libkdeinit_kcontrol_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
 --- kcontrol/kded/Makefile.in
 +++ kcontrol/kded/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24802,7 +63487,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24811,7 +63560,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24823,18 +63572,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -935,7 +938,7 @@
- 	-rm -f  kcmkded.moc
- 
- #>+ 2
--KDE_DIST=kcmkded.desktop Makefile.in kcmkded.h Makefile.am 
-+KDE_DIST=kcmkded.desktop kcmkded.h Makefile.in Makefile.am 
- 
- #>+ 3
- clean-closures:
 --- kcontrol/kdm/Makefile.in
 +++ kcontrol/kdm/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -305,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24844,7 +63592,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -355,6 +359,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -362,12 +367,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -388,10 +390,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -561,6 +567,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -568,10 +575,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24853,7 +63665,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24867,7 +63679,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/keys/Makefile.in
 +++ kcontrol/keys/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -305,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24877,7 +63697,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -355,6 +359,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -362,12 +367,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -388,10 +390,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -561,6 +567,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -568,10 +575,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24886,7 +63770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24898,7 +63782,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1018,18 +1021,18 @@
+@@ -1018,18 +1027,18 @@
  mocs: treeview.moc
  
  #>+ 3
@@ -24923,7 +63807,7 @@
  
  #>+ 3
  keyconfig.moc: $(srcdir)/keyconfig.h
-@@ -1047,7 +1050,7 @@
+@@ -1047,7 +1056,7 @@
  
  #>+ 3
  clean-metasources:
@@ -24932,7 +63816,7 @@
  
  #>+ 2
  KDE_DIST=keys.desktop commandShortcuts.h kaccelaction.h treeview.h win3.kksrc main.h kde4.kksrc shortcuts.h win4.kksrc mac4.kksrc khotkeys.h modifiers.h keyconfig.h keyconfig.cpp wm3.kksrc convertShortcuts.pl unix3.kksrc Makefile.in kde3.kksrc kaccel.upd Makefile.am 
-@@ -1098,7 +1101,7 @@
+@@ -1098,7 +1107,7 @@
  
  
  #>+ 11
@@ -24943,7 +63827,15 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_keys_la.all_cpp.final; \
 --- kcontrol/kfontinst/kcmfontinst/Makefile.in
 +++ kcontrol/kfontinst/kcmfontinst/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -306,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24953,7 +63845,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -356,6 +360,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -363,12 +368,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,10 +391,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -562,6 +568,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -569,10 +576,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -625,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24962,7 +63918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -663,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24974,29 +63930,36 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -987,16 +990,16 @@
- 
- #>+ 13
+@@ -989,15 +998,15 @@
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
  	$(INSTALL_DATA) $(srcdir)/cr16-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
  
  #>+ 15
+ force-reedit:
 --- kcontrol/kfontinst/kfile-plugin/Makefile.in
 +++ kcontrol/kfontinst/kfile-plugin/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25006,7 +63969,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25015,7 +64042,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25029,7 +64056,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/kfontinst/Makefile.in
 +++ kcontrol/kfontinst/kfontinst/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -306,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25039,7 +64074,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -356,6 +360,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -363,12 +368,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,10 +391,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -562,6 +568,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -569,10 +576,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -617,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -25048,7 +64147,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25062,7 +64161,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/kio/Makefile.in
 +++ kcontrol/kfontinst/kio/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25072,7 +64179,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -614,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25081,7 +64252,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25093,9 +64264,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -978,7 +987,7 @@
+ 
+ 
+ #>+ 2
+-KDE_DIST=system-folder.desktop package.desktop fonts.protocol folder.desktop fonts.desktop Makefile.in Makefile.am 
++KDE_DIST=system-folder.desktop package.desktop folder.desktop fonts.protocol fonts.desktop Makefile.in Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
 --- kcontrol/kfontinst/lib/Makefile.in
 +++ kcontrol/kfontinst/lib/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25105,7 +64293,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25114,7 +64366,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25128,7 +64380,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/Makefile.in
 +++ kcontrol/kfontinst/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -279,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25138,7 +64398,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -329,6 +333,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -336,12 +341,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,10 +364,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -374,6 +379,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -535,6 +541,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -542,10 +549,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -576,7 +585,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -25147,7 +64471,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25161,7 +64485,15 @@
  mostlyclean-libtool:
 --- kcontrol/kfontinst/thumbnail/Makefile.in
 +++ kcontrol/kfontinst/thumbnail/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25171,7 +64503,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25180,7 +64576,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25194,7 +64590,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/viewpart/Makefile.in
 +++ kcontrol/kfontinst/viewpart/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -179,6 +179,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -323,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25204,7 +64608,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -633,7 +636,7 @@
+@@ -373,6 +377,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -380,12 +385,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,10 +408,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -418,6 +423,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -579,6 +585,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -586,10 +593,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -633,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25213,7 +64681,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +674,9 @@
+@@ -671,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25225,61 +64693,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1036,11 +1039,11 @@
+@@ -1036,6 +1045,13 @@
  .NOEXPORT:
  
  #>+ 3
--FontViewPart.moc: $(srcdir)/FontViewPart.h
--	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
 +FontViewerApp.moc: $(srcdir)/FontViewerApp.h
 +	$(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
- 
- #>+ 2
--mocs: FontViewPart.moc
++
++#>+ 2
 +mocs: FontViewerApp.moc
++
++#>+ 3
+ FontViewPart.moc: $(srcdir)/FontViewPart.h
+ 	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
  
- #>+ 3
- FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
-@@ -1050,11 +1053,11 @@
+@@ -1050,13 +1066,6 @@
  mocs: FontViewPartFactory.moc
  
  #>+ 3
 -FontViewerApp.moc: $(srcdir)/FontViewerApp.h
 -	$(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
-+FontViewPart.moc: $(srcdir)/FontViewPart.h
-+	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: FontViewerApp.moc
-+mocs: FontViewPart.moc
- 
- #>+ 3
+-
+-#>+ 3
  FontPreview.moc: $(srcdir)/FontPreview.h
-@@ -1074,7 +1077,7 @@
+ 	$(MOC) $(srcdir)/FontPreview.h -o FontPreview.moc
  
+@@ -1074,7 +1083,7 @@
+ 
  #>+ 3
  clean-metasources:
 -	-rm -f  FontViewPart.moc FontViewPartFactory.moc FontViewerApp.moc FontPreview.moc
-+	-rm -f  FontViewerApp.moc FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
++	-rm -f  FontViewerApp.moc FontViewPart.moc FontViewPartFactory.moc FontPreview.moc
  
  #>+ 2
  KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc 
-@@ -1125,7 +1128,7 @@
- 
- 
- #>+ 11
--libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp  FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
-+libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp  FontViewPart.moc FontViewPartFactory.moc FontPreview.moc
- 	@echo 'creating libkfontviewpart_la.all_cpp.cpp ...'; \
- 	rm -f libkfontviewpart_la.all_cpp.files libkfontviewpart_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkfontviewpart_la.all_cpp.final; \
-@@ -1165,9 +1168,9 @@
- FontPreview.lo: FontPreview.moc 
- FontPreview.o: FontPreview.moc 
- nmcheck-am: nmcheck
--FontViewPart.o: FontViewPart.moc 
+@@ -1168,6 +1177,6 @@
+ FontViewPart.o: FontViewPart.moc 
  FontViewPartFactory.lo: FontViewPartFactory.moc 
-+FontViewPart.o: FontViewPart.moc 
  FontViewPart.lo: FontViewPart.moc 
 -FontViewPartFactory.o: FontViewPartFactory.moc 
  FontViewerApp.lo: FontViewerApp.moc 
@@ -25287,7 +64740,15 @@
  FontViewerApp.o: FontViewerApp.moc 
 --- kcontrol/kicker/Makefile.in
 +++ kcontrol/kicker/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -166,6 +166,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -310,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25297,7 +64758,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -633,7 +636,7 @@
+@@ -360,6 +364,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -367,12 +372,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -393,10 +395,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -405,6 +410,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -566,6 +572,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -573,10 +580,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -633,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25306,7 +64831,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +674,9 @@
+@@ -671,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25318,71 +64843,55 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1010,11 +1013,11 @@
+@@ -1017,18 +1026,18 @@
+ mocs: lookandfeelconfig.moc
  
- 
  #>+ 3
--lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
--	$(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
+-menutab_impl.moc: $(srcdir)/menutab_impl.h
+-	$(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
 +applettab_impl.moc: $(srcdir)/applettab_impl.h
 +	$(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
  
  #>+ 2
--mocs: lookandfeelconfig.moc
+-mocs: menutab_impl.moc
 +mocs: applettab_impl.moc
  
  #>+ 3
- menutab_impl.moc: $(srcdir)/menutab_impl.h
-@@ -1024,11 +1027,11 @@
- mocs: menutab_impl.moc
- 
- #>+ 3
 -applettab_impl.moc: $(srcdir)/applettab_impl.h
 -	$(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
-+lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
-+	$(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
++menutab_impl.moc: $(srcdir)/menutab_impl.h
++	$(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
  
  #>+ 2
 -mocs: applettab_impl.moc
-+mocs: lookandfeelconfig.moc
++mocs: menutab_impl.moc
  
  #>+ 3
  positionconfig.moc: $(srcdir)/positionconfig.h
-@@ -1095,10 +1098,10 @@
+@@ -1095,10 +1104,10 @@
  
  #>+ 3
  clean-metasources:
 -	-rm -f  lookandfeelconfig.moc menutab_impl.moc applettab_impl.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
-+	-rm -f  applettab_impl.moc menutab_impl.moc lookandfeelconfig.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
++	-rm -f  lookandfeelconfig.moc applettab_impl.moc menutab_impl.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
  
  #>+ 2
 -KDE_DIST=applettab_impl.h lookandfeelconfig.h lookandfeeltab.ui lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am 
-+KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeelconfig.h lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am 
++KDE_DIST=applettab_impl.h lookandfeelconfig.h lookandfeeltab.ui lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui panel.desktop hidingconfig.h positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am 
  
  #>+ 4
  clean-idl:
-@@ -1160,7 +1163,7 @@
- 
- 
- #>+ 11
--kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp  ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp  menutab_impl.moc lookandfeelconfig.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
-+kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp  ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp  lookandfeelconfig.moc menutab_impl.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
- 	@echo 'creating kcm_kicker_la.all_cpp.cpp ...'; \
- 	rm -f kcm_kicker_la.all_cpp.files kcm_kicker_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_kicker_la.all_cpp.final; \
-@@ -1217,8 +1220,8 @@
- $(srcdir)/positiontab_impl.cpp: positiontab.h hidingtab.h lookandfeeltab.h menutab.h advancedOptions.h 
- lookandfeeltab_kcm.o: lookandfeeltab_kcm.moc 
- positionconfig.lo: positionconfig.moc 
--lookandfeelconfig.lo: lookandfeelconfig.moc 
- applettab_impl.lo: applettab_impl.moc 
-+lookandfeelconfig.lo: lookandfeelconfig.moc 
- main.o: main.moc 
- lookandfeelconfig.o: lookandfeelconfig.moc 
- menutab_impl.lo: menutab_impl.moc 
 --- kcontrol/kio/Makefile.in
 +++ kcontrol/kio/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -182,6 +182,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -326,6 +327,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25392,7 +64901,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -652,7 +655,7 @@
+@@ -376,6 +380,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -383,12 +388,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,10 +411,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -582,6 +588,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -589,10 +596,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -652,7 +661,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25401,7 +64974,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +693,9 @@
+@@ -690,9 +699,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25413,7 +64986,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1178,18 +1181,18 @@
+@@ -1178,18 +1187,18 @@
  mocs: smbrodlg.moc
  
  #>+ 3
@@ -25438,31 +65011,92 @@
  
  #>+ 3
  kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1263,10 +1266,10 @@
+@@ -1206,13 +1215,6 @@
+ mocs: useragentdlg.moc
  
  #>+ 3
+-main.moc: $(srcdir)/main.h
+-	$(MOC) $(srcdir)/main.h -o main.moc
+-
+-#>+ 2
+-mocs: main.moc
+-
+-#>+ 3
+ kcookiesmain.moc: $(srcdir)/kcookiesmain.h
+ 	$(MOC) $(srcdir)/kcookiesmain.h -o kcookiesmain.moc
+ 
+@@ -1220,11 +1222,11 @@
+ mocs: kcookiesmain.moc
+ 
+ #>+ 3
+-kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
+-	$(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
++main.moc: $(srcdir)/main.h
++	$(MOC) $(srcdir)/main.h -o main.moc
+ 
+ #>+ 2
+-mocs: kcookiespolicies.moc
++mocs: main.moc
+ 
+ #>+ 3
+ kcookiesmanagement.moc: $(srcdir)/kcookiesmanagement.h
+@@ -1234,6 +1236,13 @@
+ mocs: kcookiesmanagement.moc
+ 
+ #>+ 3
++kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
++	$(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
++
++#>+ 2
++mocs: kcookiespolicies.moc
++
++#>+ 3
+ netpref.moc: $(srcdir)/netpref.h
+ 	$(MOC) $(srcdir)/netpref.h -o netpref.moc
+ 
+@@ -1263,10 +1272,10 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  uagentproviderdlg.moc smbrodlg.moc socks.moc kmanualproxydlg.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
-+	-rm -f  uagentproviderdlg.moc smbrodlg.moc kmanualproxydlg.moc socks.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
++	-rm -f  uagentproviderdlg.moc smbrodlg.moc kmanualproxydlg.moc socks.moc kproxydlg.moc useragentdlg.moc kcookiesmain.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
  
  #>+ 2
 -KDE_DIST=uasprovider.desktop policydlg.h fakeuaprovider.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO useragentdlg.h kio_ftprc.kcfg kioslave.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui cache_ui.ui useragentdlg_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui 
-+KDE_DIST=uasprovider.desktop fakeuaprovider.h policydlg.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO kioslave.kcfg useragentdlg.h kio_ftprc.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui useragentdlg_ui.ui cache_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui 
++KDE_DIST=uasprovider.desktop fakeuaprovider.h policydlg.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO kio_ftprc.kcfg useragentdlg.h kioslave.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui cache_ui.ui useragentdlg_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop kproxydlg.h uagentproviderdlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui 
  
  #>+ 13
  clean-ui:
-@@ -1328,7 +1331,7 @@
+@@ -1328,7 +1337,7 @@
  
  
  #>+ 11
 -kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc socks.moc kmanualproxydlg.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
-+kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc kmanualproxydlg.moc socks.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
++kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc kmanualproxydlg.moc socks.moc useragentdlg.moc main.moc kcookiespolicies.moc kcookiesmanagement.moc cache.moc
  	@echo 'creating kcm_kio_la.all_cpp.cpp ...'; \
  	rm -f kcm_kio_la.all_cpp.files kcm_kio_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
+@@ -1368,8 +1377,8 @@
+ kmanualproxydlg.lo: kmanualproxydlg.moc 
+ $(srcdir)/cache.cpp: socksbase.h kproxydlg_ui.h kcookiesmanagementdlg_ui.h kcookiespoliciesdlg_ui.h policydlg_ui.h useragentdlg_ui.h uagentproviderdlg_ui.h manualproxy_ui.h envvarproxy_ui.h cache_ui.h 
+ kcookiespolicies.o: kcookiespolicies.moc 
+-kcookiesmain.lo: kcookiesmain.moc 
+ main.lo: main.moc 
++kcookiesmain.lo: kcookiesmain.moc 
+ uagentproviderdlg.lo: uagentproviderdlg.moc 
+ $(srcdir)/main.cpp: socksbase.h kproxydlg_ui.h kcookiesmanagementdlg_ui.h kcookiespoliciesdlg_ui.h policydlg_ui.h useragentdlg_ui.h uagentproviderdlg_ui.h manualproxy_ui.h envvarproxy_ui.h cache_ui.h 
+ $(srcdir)/socks.cpp: socksbase.h kproxydlg_ui.h kcookiesmanagementdlg_ui.h kcookiespoliciesdlg_ui.h policydlg_ui.h useragentdlg_ui.h uagentproviderdlg_ui.h manualproxy_ui.h envvarproxy_ui.h cache_ui.h 
 --- kcontrol/kio/uasproviders/Makefile.in
 +++ kcontrol/kio/uasproviders/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25472,7 +65106,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -564,7 +573,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25481,7 +65179,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -602,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25493,18 +65191,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -764,7 +767,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie60oncurrent.desktop ie55onwinnt5.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop Makefile.am mozoncurrent12.desktop 
-+KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie55onwinnt5.desktop ie60oncurrent.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop mozoncurrent12.desktop Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kcontrol/knotify/Makefile.in
 +++ kcontrol/knotify/Makefile.in
-@@ -315,6 +315,9 @@
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -315,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25514,7 +65211,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -365,6 +369,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -372,12 +377,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -398,10 +400,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -410,6 +415,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -571,6 +577,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -578,10 +585,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -622,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25523,7 +65284,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25537,7 +65298,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/knotify/sounds/Makefile.in
 +++ kcontrol/knotify/sounds/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25547,7 +65316,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -664,7 +667,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -664,7 +673,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25556,7 +65389,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -702,9 +705,9 @@
+@@ -702,9 +711,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25568,9 +65401,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -864,7 +873,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Beep_Door.wav KDE_Window_UnSticky.wav KDE_Window_Maximize.wav KDE_Beep_ClassicBeep.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Desktop2.wav KDE_Window_Close.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Desktop4.wav KDE_Window_UnMaximize.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav 
++KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Beep_Door.wav KDE_Window_UnSticky.wav KDE_Beep_ClassicBeep.wav KDE_Window_Maximize.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Window_Close.wav KDE_Desktop2.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Window_UnMaximize.wav KDE_Desktop4.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav 
+ 
+ #>+ 2
+ docs-am:
 --- kcontrol/konq/Makefile.in
 +++ kcontrol/konq/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -305,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25580,7 +65430,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -355,6 +359,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -362,12 +367,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -388,10 +390,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -561,6 +567,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -568,10 +575,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -622,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25589,7 +65503,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25601,18 +65515,60 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1056,7 +1059,7 @@
- 	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
+@@ -1031,18 +1040,18 @@
+ mocs: desktopbehavior_impl.moc
  
+ #>+ 3
+-browser.moc: $(srcdir)/browser.h
+-	$(MOC) $(srcdir)/browser.h -o browser.moc
++desktop.moc: $(srcdir)/desktop.h
++	$(MOC) $(srcdir)/desktop.h -o desktop.moc
+ 
  #>+ 2
--KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h filepreviews.desktop desktop.h previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop Makefile.am desktop.desktop 
-+KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h desktop.h filepreviews.desktop previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop desktop.desktop Makefile.am 
+-mocs: browser.moc
++mocs: desktop.moc
  
- #>+ 4
- clean-idl:
+ #>+ 3
+-desktop.moc: $(srcdir)/desktop.h
+-	$(MOC) $(srcdir)/desktop.h -o desktop.moc
++browser.moc: $(srcdir)/browser.h
++	$(MOC) $(srcdir)/browser.h -o browser.moc
+ 
+ #>+ 2
+-mocs: desktop.moc
++mocs: browser.moc
+ 
+ #>+ 3
+ rootopts.moc: $(srcdir)/rootopts.h
+@@ -1053,7 +1062,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
++	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc rootopts.moc
+ 
+ #>+ 2
+ KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h filepreviews.desktop desktop.h previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop Makefile.am desktop.desktop 
+@@ -1114,7 +1123,7 @@
+ 
+ 
+ #>+ 11
+-kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc desktopbehavior.moc rootopts.moc
++kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc desktopbehavior.moc rootopts.moc
+ 	@echo 'creating kcm_konq_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_konq_la.all_cpp.files kcm_konq_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_konq_la.all_cpp.final; \
 --- kcontrol/konqhtml/Makefile.in
 +++ kcontrol/konqhtml/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25622,7 +65578,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -617,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25631,7 +65651,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25643,35 +65663,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -986,13 +989,6 @@
- mocs: jspolicies.moc
- 
- #>+ 3
--appearance.moc: $(srcdir)/appearance.h
--	$(MOC) $(srcdir)/appearance.h -o appearance.moc
--
--#>+ 2
--mocs: appearance.moc
--
--#>+ 3
- main.moc: $(srcdir)/main.h
- 	$(MOC) $(srcdir)/main.h -o main.moc
- 
-@@ -1007,6 +1003,13 @@
- mocs: jsopts.moc
- 
- #>+ 3
-+appearance.moc: $(srcdir)/appearance.h
-+	$(MOC) $(srcdir)/appearance.h -o appearance.moc
-+
-+#>+ 2
-+mocs: appearance.moc
-+
-+#>+ 3
- javaopts.moc: $(srcdir)/javaopts.h
- 	$(MOC) $(srcdir)/javaopts.h -o javaopts.moc
- 
-@@ -1035,22 +1038,22 @@
+@@ -1035,25 +1044,25 @@
  mocs: advancedTabDialog.moc
  
  #>+ 3
@@ -25697,22 +65689,34 @@
  #>+ 3
  clean-metasources:
 -	-rm -f  khttpoptdlg.moc filteropts.moc jspolicies.moc appearance.moc main.moc jsopts.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
-+	-rm -f  khttpoptdlg.moc filteropts.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
++	-rm -f  khttpoptdlg.moc filteropts.moc jspolicies.moc appearance.moc main.moc jsopts.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
  
  #>+ 2
- KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
-@@ -1107,7 +1110,7 @@
+-KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
++KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h javaopts.h khttpoptdlg.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
  
+ #>+ 5
+ clean-ui:
+@@ -1107,7 +1116,7 @@
  
+ 
  #>+ 11
 -kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp  khttpoptdlg.moc jspolicies.moc filteropts.moc jsopts.moc main.moc appearance.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
-+kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp  khttpoptdlg.moc jspolicies.moc filteropts.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
++kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp  khttpoptdlg.moc jspolicies.moc filteropts.moc jsopts.moc main.moc appearance.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
  	@echo 'creating kcm_konqhtml_la.all_cpp.cpp ...'; \
  	rm -f kcm_konqhtml_la.all_cpp.files kcm_konqhtml_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
 --- kcontrol/konsole/Makefile.in
 +++ kcontrol/konsole/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25722,7 +65726,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25731,7 +65799,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25745,7 +65813,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/krdb/ad/Makefile.in
 +++ kcontrol/krdb/ad/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -121,6 +121,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -265,6 +266,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25755,7 +65831,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -315,6 +319,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -322,12 +327,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -348,10 +350,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -360,6 +365,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -521,6 +527,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -528,10 +535,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -564,7 +573,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25764,7 +65904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -602,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25776,18 +65916,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-@@ -785,7 +788,7 @@
+@@ -785,7 +794,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad Makefile.in XOsview.ad WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
-+KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad XOsview.ad Makefile.in WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
++KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad krdb Xdvi.ad AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad Makefile.in XOsview.ad Editres.ad WPerfect.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
  
  #>+ 2
  docs-am:
 --- kcontrol/krdb/kcs/Makefile.in
 +++ kcontrol/krdb/kcs/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25797,7 +65945,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -562,7 +571,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25806,7 +66018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25818,18 +66030,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -764,7 +767,7 @@
+@@ -764,7 +773,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc Pumpkin.kcsrc MediaPeach.kcsrc DarkBlue.kcsrc KDEOne.kcsrc DesertRed.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc Windows95.kcsrc CDE.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
-+KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc MediaPeach.kcsrc Pumpkin.kcsrc DarkBlue.kcsrc DesertRed.kcsrc KDEOne.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc CDE.kcsrc Windows95.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
++KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc Pumpkin.kcsrc MediaPeach.kcsrc DarkBlue.kcsrc DesertRed.kcsrc KDEOne.kcsrc Keramik.kcsrc WindowsXP.kcsrc BeOS.kcsrc BlackOnWhite.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc YellowOnBlue.kcsrc CDE.kcsrc Windows95.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
  
  #>+ 2
  docs-am:
 --- kcontrol/krdb/Makefile.in
 +++ kcontrol/krdb/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -306,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25839,7 +66059,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -356,6 +360,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -363,12 +368,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,10 +391,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -562,6 +568,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -569,10 +576,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25848,7 +66132,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25862,7 +66146,15 @@
  clean-noinstLTLIBRARIES:
 --- kcontrol/krdb/pics/Makefile.in
 +++ kcontrol/krdb/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25872,7 +66164,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25881,7 +66237,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25895,7 +66251,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastDark/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastDark/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25905,7 +66269,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25914,7 +66342,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25928,7 +66356,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25938,7 +66374,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25947,7 +66447,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25961,7 +66461,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastLight/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastLight/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25971,7 +66479,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25980,7 +66552,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25994,7 +66566,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26004,7 +66584,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26013,7 +66657,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26027,7 +66671,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/KDE_Classic/Makefile.in
 +++ kcontrol/krdb/themes/KDE_Classic/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26037,7 +66689,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26046,7 +66762,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26060,7 +66776,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Keramik/Makefile.in
 +++ kcontrol/krdb/themes/Keramik/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26070,7 +66794,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26079,7 +66867,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26093,7 +66881,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Makefile.in
 +++ kcontrol/krdb/themes/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26103,7 +66899,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -563,7 +572,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26112,7 +66972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26126,7 +66986,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Plastik/Makefile.in
 +++ kcontrol/krdb/themes/Plastik/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26136,7 +67004,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26145,7 +67077,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26159,7 +67091,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Platinum/Makefile.in
 +++ kcontrol/krdb/themes/Platinum/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26169,7 +67109,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26178,7 +67182,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26192,7 +67196,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Redmond/Makefile.in
 +++ kcontrol/krdb/themes/Redmond/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26202,7 +67214,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26211,7 +67287,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26225,7 +67301,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Sunshine/Makefile.in
 +++ kcontrol/krdb/themes/Sunshine/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26235,7 +67319,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26244,7 +67392,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26258,7 +67406,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/YellowOnBlue/Makefile.in
 +++ kcontrol/krdb/themes/YellowOnBlue/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26268,7 +67424,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26277,7 +67497,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26291,7 +67511,15 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
 +++ kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26301,7 +67529,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26310,7 +67602,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26324,7 +67616,15 @@
  mostlyclean-libtool:
 --- kcontrol/kthememanager/Makefile.in
 +++ kcontrol/kthememanager/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -162,6 +162,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -306,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26334,7 +67634,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -356,6 +360,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -363,12 +368,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -389,10 +391,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -562,6 +568,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -569,10 +576,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26343,7 +67707,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26357,7 +67721,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/launch/Makefile.in
 +++ kcontrol/launch/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26367,7 +67739,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26376,7 +67812,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26390,7 +67826,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/locale/default/Makefile.in
 +++ kcontrol/locale/default/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26400,7 +67844,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26409,7 +67917,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26423,7 +67931,15 @@
  mostlyclean-libtool:
 --- kcontrol/locale/Makefile.in
 +++ kcontrol/locale/Makefile.in
-@@ -320,6 +320,9 @@
+@@ -176,6 +176,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -320,6 +321,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26433,7 +67949,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -370,6 +374,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -377,12 +382,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,10 +405,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -576,6 +582,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -583,10 +590,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -623,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26442,7 +68022,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +664,9 @@
+@@ -661,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26454,57 +68034,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1089,11 +1092,11 @@
+@@ -1089,13 +1098,6 @@
  mocs: klocalesample.moc
  
  #>+ 3
 -localeother.moc: $(srcdir)/localeother.h
 -	$(MOC) $(srcdir)/localeother.h -o localeother.moc
-+toplevel.moc: $(srcdir)/toplevel.h
-+	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: localeother.moc
-+mocs: toplevel.moc
- 
- #>+ 3
+-
+-#>+ 3
  localemon.moc: $(srcdir)/localemon.h
-@@ -1103,11 +1106,11 @@
- mocs: localemon.moc
+ 	$(MOC) $(srcdir)/localemon.h -o localemon.moc
  
+@@ -1110,6 +1112,13 @@
+ mocs: toplevel.moc
+ 
  #>+ 3
--toplevel.moc: $(srcdir)/toplevel.h
--	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
 +localeother.moc: $(srcdir)/localeother.h
 +	$(MOC) $(srcdir)/localeother.h -o localeother.moc
- 
- #>+ 2
--mocs: toplevel.moc
++
++#>+ 2
 +mocs: localeother.moc
- 
- #>+ 3
++
++#>+ 3
  kcmlocale.moc: $(srcdir)/kcmlocale.h
-@@ -1125,7 +1128,7 @@
+ 	$(MOC) $(srcdir)/kcmlocale.h -o kcmlocale.moc
  
+@@ -1125,7 +1134,7 @@
+ 
  #>+ 3
  clean-metasources:
 -	-rm -f  localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
-+	-rm -f  localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
++	-rm -f  localetime.moc klocalesample.moc localemon.moc toplevel.moc localeother.moc kcmlocale.moc localenum.moc
  
  #>+ 2
  KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am 
-@@ -1176,7 +1179,7 @@
+@@ -1176,7 +1185,7 @@
  
  
  #>+ 11
 -kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
-+kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
++kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc localeother.moc toplevel.moc localemon.moc kcmlocale.moc localenum.moc
  	@echo 'creating kcm_locale_la.all_cpp.cpp ...'; \
  	rm -f kcm_locale_la.all_cpp.files kcm_locale_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
 --- kcontrol/locale/pics/Makefile.in
 +++ kcontrol/locale/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26514,7 +68100,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26523,7 +68173,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26537,7 +68187,15 @@
  mostlyclean-libtool:
 --- kcontrol/Makefile.in
 +++ kcontrol/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -129,6 +129,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -273,6 +274,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26547,7 +68205,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -323,6 +327,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -330,12 +335,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -356,10 +358,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -368,6 +373,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -529,6 +535,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -536,10 +543,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26556,7 +68278,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26570,7 +68292,15 @@
  mostlyclean-libtool:
 --- kcontrol/nics/Makefile.in
 +++ kcontrol/nics/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26580,7 +68310,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26589,7 +68383,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26603,7 +68397,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/performance/Makefile.in
 +++ kcontrol/performance/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26613,7 +68415,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26622,7 +68488,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26634,9 +68500,60 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -962,18 +971,18 @@
+ 
+ 
+ #>+ 3
+-konqueror.moc: $(srcdir)/konqueror.h
+-	$(MOC) $(srcdir)/konqueror.h -o konqueror.moc
++system.moc: $(srcdir)/system.h
++	$(MOC) $(srcdir)/system.h -o system.moc
+ 
+ #>+ 2
+-mocs: konqueror.moc
++mocs: system.moc
+ 
+ #>+ 3
+-system.moc: $(srcdir)/system.h
+-	$(MOC) $(srcdir)/system.h -o system.moc
++konqueror.moc: $(srcdir)/konqueror.h
++	$(MOC) $(srcdir)/konqueror.h -o konqueror.moc
+ 
+ #>+ 2
+-mocs: system.moc
++mocs: konqueror.moc
+ 
+ #>+ 3
+ kcmperformance.moc: $(srcdir)/kcmperformance.h
+@@ -984,7 +993,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  konqueror.moc system.moc kcmperformance.moc
++	-rm -f  system.moc konqueror.moc kcmperformance.moc
+ 
+ #>+ 2
+ KDE_DIST=kcmperformance.h kcmperformance.desktop konqueror_ui.ui system_ui.ui Makefile.in kcmkonqyperformance.desktop Makefile.am 
+@@ -1041,7 +1050,7 @@
+ 
+ 
+ #>+ 11
+-kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp  system_ui.moc system.moc konqueror.moc kcmperformance.moc konqueror_ui.moc
++kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp  system_ui.moc konqueror.moc system.moc kcmperformance.moc konqueror_ui.moc
+ 	@echo 'creating kcm_performance_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_performance_la.all_cpp.files kcm_performance_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_performance_la.all_cpp.final; \
 --- kcontrol/pics/Makefile.in
 +++ kcontrol/pics/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26646,7 +68563,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -26655,7 +68636,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -581,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26667,12 +68648,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,581 +729,581 @@
+@@ -726,581 +735,581 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png cr48-app-input_devices_settings.png crsc-app-samba.svgz cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr48-app-date.png cr48-app-bell.png cr32-app-style.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr128-app-fonts.png cr16-app-iconthemes.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr48-app-colors.png cr64-app-kcmpci.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr32-app-keyboard_layout.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr48-app-usb.png cr32-app-enhanced_browsing.png cr128-app-energy.png cr128-app-kdmconfig.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr32-app-kcmkwm.png cr48-app-access.png cr22-app-bell.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr48-app-kthememgr.png cr128-app-bell.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr64-app-energy_star.png cr16-app-hwinfo.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-device-laptop.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png cr22-app-personal.png cr48-app-kscreensaver.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png crsc-app-ieee1394.svgz cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr64-app-bell.png cr128-app-date.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr48-app-samba.png cr64-app-kcmdf.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr48-app-background.png cr128-app-personal.png cr48-app-knotify.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr22-device-laptop.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr22-app-fonts.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am 
-+KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr64-app-locale.png cr48-app-kcmx.png cr22-app-arts.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr22-app-hwinfo.png cr48-app-multimedia.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr48-app-key_bindings.png cr64-app-hwinfo.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr64-app-kcmpci.png cr48-app-colors.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr32-app-date.png cr128-app-proxy.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-keyboard_layout.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr32-app-kscreensaver.png cr22-app-kcmkwm.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr128-app-kcmmemory.png cr22-app-date.png cr16-app-bell.png cr32-app-arts.png cr48-app-kcmsystem.png cr48-app-agent.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr48-device-laptop.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr16-app-personal.png cr128-app-kcmdevices.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png crsc-app-ieee1394.svgz cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr22-app-access.png cr48-app-samba.png cr64-app-kcmdf.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr128-app-personal.png cr48-app-knotify.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png cr22-device-laptop.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am 
++KDE_DIST=cr32-app-input_devices_settings.png cr48-app-stylesheet.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr128-app-kcmpartitions.png cr16-app-kcmmemory.png cr32-app-background.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr48-app-colors.png cr64-app-kcmpci.png cr48-app-energy_star.png cr64-app-energy.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-access.svgz crsc-app-energy.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png crsc-app-filetypes.svgz cr128-app-kcmkwm.png cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr32-app-keyboard_layout.png cr128-app-kcmdf.png cr22-app-kcmx.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr48-app-energy.png cr22-app-style.png cr32-app-agent.png cr64-app-kcmmemory.png cr32-app-kcmprocessor.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr22-app-kdmconfig.png cr16-app-date.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr22-app-date.png cr128-app-kcmmemory.png cr16-app-bell.png cr32-app-arts.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr48-device-laptop.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png crsc-app-ieee1394.svgz cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr64-app-kcmdf.png cr48-app-samba.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr48-app-knotify.png cr128-app-personal.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr22-app-cookie.png cr48-app-hwinfo.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png cr22-device-laptop.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr16-app-kthememgr.png cr22-app-fonts.png cr32-app-iconthemes.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am 
  
  #>+ 2
  docs-am:
@@ -26680,33 +68661,43 @@
  #>+ 570
  install-kde-icons:
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
++	$(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
@@ -26714,19 +68705,16 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
@@ -26741,23 +68729,14 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
@@ -26765,9 +68744,7 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
@@ -26804,18 +68781,28 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
- 	$(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
+-	$(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
@@ -26826,11 +68813,7 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
@@ -26845,21 +68828,24 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
@@ -26875,13 +68861,22 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
--	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
@@ -26891,72 +68886,50 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
++	$(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
@@ -26964,7 +68937,24 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
@@ -26976,70 +68966,133 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
++	$(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
++	$(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
++	$(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
@@ -27052,269 +69105,129 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
  	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
+-	$(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
- 	$(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
 -	$(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
++	$(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
--	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
++	$(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
@@ -27326,34 +69239,42 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
@@ -27365,25 +69286,9 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
@@ -27404,34 +69309,45 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
@@ -27447,7 +69363,11 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
@@ -27458,7 +69378,8 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
@@ -27476,30 +69397,23 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
@@ -27507,15 +69421,10 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
@@ -27528,53 +69437,57 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
@@ -27586,27 +69499,32 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
@@ -27622,22 +69540,58 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
@@ -27648,115 +69602,152 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
  
  #>+ 15
  force-reedit:
 --- kcontrol/privacy/Makefile.in
 +++ kcontrol/privacy/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27766,7 +69757,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27775,7 +69830,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27789,7 +69844,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/randr/Makefile.in
 +++ kcontrol/randr/Makefile.in
-@@ -327,6 +327,9 @@
+@@ -183,6 +183,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -327,6 +328,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27799,7 +69862,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -377,6 +381,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -384,12 +389,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -410,10 +412,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -583,6 +589,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -590,10 +597,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -639,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27808,7 +69935,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -677,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27822,7 +69949,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/samba/Makefile.in
 +++ kcontrol/samba/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27832,7 +69967,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27841,7 +70040,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27855,7 +70054,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/screensaver/Makefile.in
 +++ kcontrol/screensaver/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27865,7 +70072,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27874,7 +70145,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27888,7 +70159,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/smartcard/Makefile.in
 +++ kcontrol/smartcard/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27898,7 +70177,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27907,7 +70250,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27921,7 +70264,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/smserver/Makefile.in
 +++ kcontrol/smserver/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27931,7 +70282,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27940,7 +70355,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27954,7 +70369,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/spellchecking/Makefile.in
 +++ kcontrol/spellchecking/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -293,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27964,7 +70387,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -343,6 +347,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -350,12 +355,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,10 +378,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -388,6 +393,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -549,6 +555,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -556,10 +563,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27973,7 +70460,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27987,7 +70474,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/style/keramik/Makefile.in
 +++ kcontrol/style/keramik/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27997,7 +70492,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28006,7 +70565,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28020,7 +70579,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/style/Makefile.in
 +++ kcontrol/style/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -172,6 +172,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -316,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28030,7 +70597,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -366,6 +370,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -373,12 +378,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -399,10 +401,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -572,6 +578,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -579,10 +586,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -621,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28039,7 +70670,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +662,9 @@
+@@ -659,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28051,9 +70682,66 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -1063,22 +1072,22 @@
+ mocs: kcmstyle.moc
+ 
+ #>+ 3
+-styleconfdialog.moc: $(srcdir)/styleconfdialog.h
+-	$(MOC) $(srcdir)/styleconfdialog.h -o styleconfdialog.moc
++menupreview.moc: $(srcdir)/menupreview.h
++	$(MOC) $(srcdir)/menupreview.h -o menupreview.moc
+ 
+ #>+ 2
+-mocs: styleconfdialog.moc
++mocs: menupreview.moc
+ 
+ #>+ 3
+-menupreview.moc: $(srcdir)/menupreview.h
+-	$(MOC) $(srcdir)/menupreview.h -o menupreview.moc
++styleconfdialog.moc: $(srcdir)/styleconfdialog.h
++	$(MOC) $(srcdir)/styleconfdialog.h -o styleconfdialog.moc
+ 
+ #>+ 2
+-mocs: menupreview.moc
++mocs: styleconfdialog.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kcmstyle.moc styleconfdialog.moc menupreview.moc
++	-rm -f  kcmstyle.moc menupreview.moc styleconfdialog.moc
+ 
+ #>+ 2
+ KDE_DIST=styleconfdialog.h Makefile.in style.desktop stylepreview.ui stylepreview.ui.h main.cpp Makefile.am 
+@@ -1134,7 +1143,7 @@
+ 
+ 
+ #>+ 11
+-kcm_style_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmstyle.cpp $(srcdir)/menupreview.cpp $(srcdir)/styleconfdialog.cpp stylepreview.cpp  kcmstyle.moc stylepreview.moc menupreview.moc styleconfdialog.moc
++kcm_style_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmstyle.cpp $(srcdir)/menupreview.cpp $(srcdir)/styleconfdialog.cpp stylepreview.cpp  kcmstyle.moc stylepreview.moc styleconfdialog.moc menupreview.moc
+ 	@echo 'creating kcm_style_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_style_la.all_cpp.files kcm_style_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_style_la.all_cpp.final; \
+@@ -1177,8 +1186,8 @@
+ nmcheck-am: nmcheck
+ kcmstyle.lo: kcmstyle.moc 
+ kcmstyle.o: kcmstyle.moc 
+-styleconfdialog.o: styleconfdialog.moc 
+ menupreview.lo: menupreview.moc 
++styleconfdialog.o: styleconfdialog.moc 
+ $(srcdir)/styleconfdialog.cpp: stylepreview.h 
+ styleconfdialog.lo: styleconfdialog.moc 
+ 
 --- kcontrol/taskbar/Makefile.in
 +++ kcontrol/taskbar/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28063,7 +70751,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28072,7 +70824,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28086,7 +70838,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/usbview/Makefile.in
 +++ kcontrol/usbview/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28096,7 +70856,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28105,7 +70929,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28119,7 +70943,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/view1394/Makefile.in
 +++ kcontrol/view1394/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28129,7 +70961,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28138,7 +71034,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28152,7 +71048,15 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/xinerama/Makefile.in
 +++ kcontrol/xinerama/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28162,7 +71066,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28171,7 +71139,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28185,7 +71153,15 @@
  	@$(NORMAL_INSTALL)
 --- kdcop/Makefile.in
 +++ kdcop/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -308,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28195,7 +71171,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -358,6 +362,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -365,12 +370,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,10 +393,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -564,6 +570,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -571,10 +578,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -609,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28204,7 +71244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -647,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28218,7 +71258,15 @@
  	@$(NORMAL_INSTALL)
 --- kdebugdialog/Makefile.in
 +++ kdebugdialog/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -292,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28228,7 +71276,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -342,6 +346,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -349,12 +354,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,10 +377,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -548,6 +554,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -555,10 +562,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28237,7 +71349,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28251,7 +71363,15 @@
  	@$(NORMAL_INSTALL)
 --- kdeeject/Makefile.in
 +++ kdeeject/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -111,6 +111,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -255,6 +256,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28261,7 +71381,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -547,7 +550,7 @@
+@@ -305,6 +309,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -312,12 +317,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,10 +340,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -350,6 +355,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -511,6 +517,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -518,10 +525,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -547,7 +556,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28270,7 +71454,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +588,9 @@
+@@ -585,9 +594,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28284,7 +71468,15 @@
  	@$(NORMAL_INSTALL)
 --- kdepasswd/kcm/Makefile.in
 +++ kdepasswd/kcm/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -314,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28294,7 +71486,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -364,6 +368,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -371,12 +376,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -397,10 +399,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -409,6 +414,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -570,6 +576,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -577,10 +584,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -623,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28303,7 +71559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +664,9 @@
+@@ -661,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28317,7 +71573,15 @@
  	@$(NORMAL_INSTALL)
 --- kdepasswd/kcm/pics/Makefile.in
 +++ kdepasswd/kcm/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28327,7 +71591,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -561,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28336,7 +71664,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28348,18 +71676,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -760,7 +763,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Bug.png Rabbit.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am 
-+KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Rabbit.png Bug.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kdepasswd/Makefile.in
 +++ kdepasswd/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -172,6 +172,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -316,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28369,7 +71696,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -366,6 +370,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -373,12 +378,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -399,10 +401,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -572,6 +578,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -579,10 +586,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28378,7 +71769,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28392,7 +71783,15 @@
  	@$(NORMAL_INSTALL)
 --- kdeprint/descriptions/Makefile.in
 +++ kdeprint/descriptions/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -280,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28402,7 +71801,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -330,6 +334,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -337,12 +342,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -363,10 +365,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -375,6 +380,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -536,6 +542,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -543,10 +550,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28411,7 +71874,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -615,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28425,7 +71888,15 @@
  	@rm -f sortthem$(EXEEXT)
 --- kdeprint/kdeprintfax/Makefile.in
 +++ kdeprint/kdeprintfax/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -309,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28435,7 +71906,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -359,6 +363,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -366,12 +371,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,10 +394,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -404,6 +409,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -565,6 +571,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -572,10 +579,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28444,7 +71979,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28456,34 +71991,60 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1031,38 +1034,38 @@
- 	-rm -f  conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
+@@ -985,18 +994,18 @@
+ .NOEXPORT:
  
+ #>+ 3
+-conffilters.moc: $(srcdir)/conffilters.h
+-	$(MOC) $(srcdir)/conffilters.h -o conffilters.moc
++faxab.moc: $(srcdir)/faxab.h
++	$(MOC) $(srcdir)/faxab.h -o faxab.moc
+ 
  #>+ 2
+-mocs: conffilters.moc
++mocs: faxab.moc
+ 
+ #>+ 3
+-faxab.moc: $(srcdir)/faxab.h
+-	$(MOC) $(srcdir)/faxab.h -o faxab.moc
++conffilters.moc: $(srcdir)/conffilters.h
++	$(MOC) $(srcdir)/conffilters.h -o conffilters.moc
+ 
+ #>+ 2
+-mocs: faxab.moc
++mocs: conffilters.moc
+ 
+ #>+ 3
+ confsystem.moc: $(srcdir)/confsystem.h
+@@ -1028,10 +1037,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
++	-rm -f  faxab.moc conffilters.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
+ 
+ #>+ 2
 -KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png Makefile.in conffilters.h anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz faxab.h hi32-app-kdeprintfax.png configdlg.h kdeprintfax.h filterdlg.h defcmds.h confgeneral.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h 
-+KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png conffilters.h Makefile.in anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz hi32-app-kdeprintfax.png faxab.h configdlg.h kdeprintfax.h filterdlg.h confgeneral.h defcmds.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h 
++KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png Makefile.in conffilters.h anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz faxab.h hi32-app-kdeprintfax.png configdlg.h kdeprintfax.h filterdlg.h confgeneral.h defcmds.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h 
  
  #>+ 2
  docs-am:
- 
- #>+ 28
+@@ -1040,29 +1049,29 @@
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
  	$(INSTALL_DATA) $(srcdir)/hisc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
@@ -28494,23 +72055,39 @@
  	$(INSTALL_DATA) $(srcdir)/cr16-action-abentry.png $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
  	-rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
  
  #>+ 15
+@@ -1104,7 +1113,7 @@
+ 
+ 
+ #>+ 11
+-kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp  faxab.moc conffilters.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
++kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp  conffilters.moc faxab.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
+ 	@echo 'creating kdeprintfax.all_cpp.cpp ...'; \
+ 	rm -f kdeprintfax.all_cpp.files kdeprintfax.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kdeprintfax.all_cpp.final; \
 --- kdeprint/kdeprint_part/Makefile.in
 +++ kdeprint/kdeprint_part/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28520,7 +72097,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28529,7 +72170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28543,7 +72184,15 @@
  	@$(NORMAL_INSTALL)
 --- kdeprint/kjobviewer/Makefile.in
 +++ kdeprint/kjobviewer/Makefile.in
-@@ -315,6 +315,9 @@
+@@ -171,6 +171,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -315,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28553,7 +72202,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -626,7 +629,7 @@
+@@ -365,6 +369,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -372,12 +377,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -398,10 +400,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -410,6 +415,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -571,6 +577,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -578,10 +585,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -626,7 +635,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28562,7 +72275,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +667,9 @@
+@@ -664,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28574,7 +72287,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1070,29 +1073,29 @@
+@@ -1070,29 +1079,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -28584,41 +72297,49 @@
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 +	$(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 +	$(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
  
  #>+ 15
  force-reedit:
 --- kdeprint/kprinter/Makefile.in
 +++ kdeprint/kprinter/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -309,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28628,7 +72349,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -359,6 +363,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -366,12 +371,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,10 +394,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -404,6 +409,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -565,6 +571,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -572,10 +579,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28637,7 +72422,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28651,7 +72436,15 @@
  	@$(NORMAL_INSTALL)
 --- kdeprint/Makefile.in
 +++ kdeprint/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28661,7 +72454,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -28670,7 +72527,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28684,7 +72541,15 @@
  mostlyclean-libtool:
 --- kdeprint/printmgr/Makefile.in
 +++ kdeprint/printmgr/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28694,7 +72559,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28703,7 +72632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28715,51 +72644,56 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -948,29 +951,29 @@
+@@ -942,29 +951,29 @@
  
  #>+ 25
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 +	$(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
  	$(INSTALL_DATA) $(srcdir)/hi64-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
  	$(INSTALL_DATA) $(srcdir)/hisc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  
  #>+ 15
  force-reedit:
 --- kdeprint/slave/Makefile.in
 +++ kdeprint/slave/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -311,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28769,7 +72703,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -361,6 +365,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -368,12 +373,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -394,10 +396,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -406,6 +411,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -567,6 +573,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -574,10 +581,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28778,7 +72776,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28792,7 +72790,15 @@
  	@$(NORMAL_INSTALL)
 --- kdeprint/slave/mimetypes/Makefile.in
 +++ kdeprint/slave/mimetypes/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28802,7 +72808,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -556,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28811,7 +72881,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28825,7 +72895,15 @@
  mostlyclean-libtool:
 --- kdeprint/slave/templates/Makefile.in
 +++ kdeprint/slave/templates/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28835,7 +72913,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -583,7 +592,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28844,7 +72986,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28858,7 +73000,15 @@
  mostlyclean-libtool:
 --- kdesktop/init/Makefile.in
 +++ kdesktop/init/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -279,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28868,7 +73018,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -329,6 +333,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -336,12 +341,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,10 +364,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -374,6 +379,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -535,6 +541,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -542,10 +549,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -28877,7 +73091,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28891,7 +73105,15 @@
  mostlyclean-libtool:
 --- kdesktop/init/Templates/Makefile.in
 +++ kdesktop/init/Templates/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -118,6 +118,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -262,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28901,7 +73123,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -312,6 +316,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -319,12 +324,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -357,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -518,6 +524,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -525,10 +532,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -571,7 +580,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28910,7 +73196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -609,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28922,18 +73208,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -794,7 +797,7 @@
+@@ -794,7 +803,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop HTMLFile.html CAMERA-Device.desktop linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
-+KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop CAMERA-Device.desktop HTMLFile.html linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
++KDE_DIST=linkCDROM.desktop ZIP-Device.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop HTMLFile.html CAMERA-Device.desktop linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
  
  #>+ 2
  docs-am:
 --- kdesktop/kwebdesktop/Makefile.in
 +++ kdesktop/kwebdesktop/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28943,7 +73237,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -602,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28952,7 +73310,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28966,7 +73324,15 @@
  	@$(NORMAL_INSTALL)
 --- kdesktop/lock/Makefile.in
 +++ kdesktop/lock/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28976,7 +73342,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -596,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -28985,7 +73415,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28999,7 +73429,15 @@
  	@$(NORMAL_INSTALL)
 --- kdesktop/Makefile.in
 +++ kdesktop/Makefile.in
-@@ -368,6 +368,9 @@
+@@ -224,6 +224,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -368,6 +369,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29009,7 +73447,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -709,7 +712,7 @@
+@@ -418,6 +422,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -425,12 +430,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -451,10 +453,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -463,6 +468,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -624,6 +630,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -631,10 +638,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -709,7 +718,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -29018,7 +73520,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -747,9 +750,9 @@
+@@ -747,9 +756,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29030,91 +73532,87 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1423,18 +1426,18 @@
- 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
- 
- #>+ 3
--minicli.moc: $(srcdir)/minicli.h
--	$(MOC) $(srcdir)/minicli.h -o minicli.moc
-+krootwm.moc: $(srcdir)/krootwm.h
-+	$(MOC) $(srcdir)/krootwm.h -o krootwm.moc
- 
- #>+ 2
--mocs: minicli.moc
-+mocs: krootwm.moc
- 
- #>+ 3
--krootwm.moc: $(srcdir)/krootwm.h
--	$(MOC) $(srcdir)/krootwm.h -o krootwm.moc
-+minicli.moc: $(srcdir)/minicli.h
-+	$(MOC) $(srcdir)/minicli.h -o minicli.moc
- 
- #>+ 2
--mocs: krootwm.moc
-+mocs: minicli.moc
- 
- #>+ 3
- startupid.moc: $(srcdir)/startupid.h
-@@ -1458,11 +1461,11 @@
+@@ -1458,13 +1467,6 @@
  mocs: desktop.moc
  
  #>+ 3
 -kdiconview.moc: $(srcdir)/kdiconview.h
 -	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
-+pixmapserver.moc: $(srcdir)/pixmapserver.h
-+	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: kdiconview.moc
-+mocs: pixmapserver.moc
- 
- #>+ 3
+-
+-#>+ 3
  kcustommenu.moc: $(srcdir)/kcustommenu.h
-@@ -1472,11 +1475,11 @@
- mocs: kcustommenu.moc
+ 	$(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc
  
+@@ -1479,11 +1481,11 @@
+ mocs: pixmapserver.moc
+ 
  #>+ 3
--pixmapserver.moc: $(srcdir)/pixmapserver.h
--	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
+-xautolock.moc: $(srcdir)/xautolock.h
+-	$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
 +kdiconview.moc: $(srcdir)/kdiconview.h
 +	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
  
  #>+ 2
--mocs: pixmapserver.moc
+-mocs: xautolock.moc
 +mocs: kdiconview.moc
  
  #>+ 3
- xautolock.moc: $(srcdir)/xautolock.h
-@@ -1503,7 +1506,7 @@
+ bgmanager.moc: $(srcdir)/bgmanager.h
+@@ -1492,6 +1494,13 @@
+ #>+ 2
+ mocs: bgmanager.moc
  
++#>+ 3
++xautolock.moc: $(srcdir)/xautolock.h
++	$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
++
++#>+ 2
++mocs: xautolock.moc
++
+ #>+ 8
+ kdesktop.la.closure: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES)
+ 	@echo "int main() {return 0;}" > kdesktop_la_closure.cc
+@@ -1503,7 +1512,7 @@
+ 
  #>+ 3
  clean-metasources:
 -	-rm -f  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.moc pixmapserver.moc xautolock.moc bgmanager.moc
-+	-rm -f  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc
++	-rm -f  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kcustommenu.moc pixmapserver.moc kdiconview.moc bgmanager.moc xautolock.moc
  
  #>+ 2
  KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h Makefile.am 
-@@ -1572,7 +1575,7 @@
+@@ -1572,7 +1581,7 @@
  
  
  #>+ 11
 -libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc
-+libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
++libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.moc pixmapserver.moc xautolock.moc bgmanager.moc
  	@echo 'creating libkdeinit_kdesktop_la.all_cc.cc ...'; \
  	rm -f libkdeinit_kdesktop_la.all_cc.files libkdeinit_kdesktop_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cc.final; \
-@@ -1584,7 +1587,7 @@
+@@ -1584,7 +1593,7 @@
  	rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
  
  #>+ 11
 -libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc
-+libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
++libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.moc pixmapserver.moc xautolock.moc bgmanager.moc
  	@echo 'creating libkdeinit_kdesktop_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_kdesktop_la.all_cpp.files libkdeinit_kdesktop_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
 --- kdesktop/patterns/Makefile.in
 +++ kdesktop/patterns/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29124,7 +73622,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29133,7 +73695,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29147,7 +73709,15 @@
  mostlyclean-libtool:
 --- kdesktop/pics/Makefile.in
 +++ kdesktop/pics/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -263,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29157,7 +73727,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -313,6 +317,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -320,12 +325,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,10 +348,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -358,6 +363,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -519,6 +525,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -526,10 +533,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29166,7 +73800,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29180,7 +73814,15 @@
  mostlyclean-libtool:
 --- kdesktop/programs/Makefile.in
 +++ kdesktop/programs/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29190,7 +73832,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29199,7 +73905,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29213,7 +73919,15 @@
  mostlyclean-libtool:
 --- kdesu/kdesu/Makefile.in
 +++ kdesu/kdesu/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -291,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29223,7 +73937,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -341,6 +345,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -348,12 +353,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,10 +376,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -547,6 +553,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -554,10 +561,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -589,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29232,7 +74010,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29246,7 +74024,15 @@
  	@$(NORMAL_INSTALL)
 --- kdesu/kdesud/Makefile.in
 +++ kdesu/kdesud/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -293,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29256,7 +74042,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -343,6 +347,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -350,12 +355,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,10 +378,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -388,6 +393,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -549,6 +555,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -556,10 +563,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -591,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29265,7 +74115,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29279,7 +74129,15 @@
  	@$(NORMAL_INSTALL)
 --- kdesu/Makefile.in
 +++ kdesu/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -124,6 +124,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -268,6 +269,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29289,7 +74147,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -318,6 +322,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -325,12 +330,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,10 +353,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -363,6 +368,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -524,6 +530,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -531,10 +538,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -29298,7 +74220,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29312,7 +74234,15 @@
  mostlyclean-libtool:
 --- kdialog/Makefile.in
 +++ kdialog/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -290,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29322,7 +74252,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -340,6 +344,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -347,12 +352,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,10 +375,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -546,6 +552,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -553,10 +560,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29331,7 +74325,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29345,7 +74339,15 @@
  	@$(NORMAL_INSTALL)
 --- kdm/backend/Makefile.in
 +++ kdm/backend/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -161,6 +161,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -305,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29355,7 +74357,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -640,7 +643,7 @@
+@@ -355,6 +359,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -362,12 +367,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -388,10 +390,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -561,6 +567,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -568,10 +575,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -640,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -29364,7 +74430,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -678,9 +681,9 @@
+@@ -678,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29378,7 +74444,15 @@
  	@$(NORMAL_INSTALL)
 --- kdm/kfrontend/Makefile.in
 +++ kdm/kfrontend/Makefile.in
-@@ -346,6 +346,9 @@
+@@ -202,6 +202,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -346,6 +347,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29388,7 +74462,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -634,7 +637,7 @@
+@@ -396,6 +400,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -403,12 +408,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -429,10 +431,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -602,6 +608,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -609,10 +616,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -634,7 +643,7 @@
  xdg_menudir = @xdg_menudir@
  
  # use 'make GENKDMCONF_FLAGS=... install' to override
@@ -29397,7 +74535,7 @@
  SUBDIRS = themer themes pics sessions
  AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
      -I$(top_srcdir)/kdmlib $(all_includes)
-@@ -689,7 +692,7 @@
+@@ -689,7 +698,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -29406,7 +74544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -727,9 +730,9 @@
+@@ -727,9 +736,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29420,7 +74558,15 @@
  	@$(NORMAL_INSTALL)
 --- kdm/kfrontend/pics/Makefile.in
 +++ kdm/kfrontend/pics/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -118,6 +118,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -262,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29430,7 +74576,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -312,6 +316,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -319,12 +324,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -357,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -518,6 +524,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -525,10 +532,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29439,7 +74649,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29453,7 +74663,15 @@
  mostlyclean-libtool:
 --- kdm/kfrontend/sessions/Makefile.in
 +++ kdm/kfrontend/sessions/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -118,6 +118,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -262,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29463,7 +74681,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -312,6 +316,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -319,12 +324,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -357,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -518,6 +524,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -525,10 +532,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -602,7 +611,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29472,7 +74754,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29484,18 +74766,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  kde.desktop: $(top_builddir)/config.status $(srcdir)/kde.desktop.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -804,7 +807,7 @@
+@@ -804,7 +813,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in wm2.desktop xfce.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
-+KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
++KDE_DIST=9wm.desktop ratpoison.desktop golem.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
  
  #>+ 2
  docs-am:
 --- kdm/kfrontend/themer/Makefile.in
 +++ kdm/kfrontend/themer/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -290,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29505,7 +74795,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -340,6 +344,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -347,12 +352,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,10 +375,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -546,6 +552,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -553,10 +560,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29514,7 +74868,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29526,62 +74880,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-@@ -881,18 +884,18 @@
- mocs: kdmitem.moc
- 
- #>+ 3
--kdmthemer.moc: $(srcdir)/kdmthemer.h
--	$(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
-+kdmpixmap.moc: $(srcdir)/kdmpixmap.h
-+	$(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
- 
- #>+ 2
--mocs: kdmthemer.moc
-+mocs: kdmpixmap.moc
- 
- #>+ 3
--kdmpixmap.moc: $(srcdir)/kdmpixmap.h
--	$(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
-+kdmthemer.moc: $(srcdir)/kdmthemer.h
-+	$(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
- 
- #>+ 2
--mocs: kdmpixmap.moc
-+mocs: kdmthemer.moc
- 
- #>+ 3
- kdmrect.moc: $(srcdir)/kdmrect.h
-@@ -903,7 +906,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
-+	-rm -f  kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am 
-@@ -950,7 +953,7 @@
- 
- 
- #>+ 11
--libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp  kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
-+libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp  kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
- 	@echo 'creating libkdmthemer_a.all_cpp.cpp ...'; \
- 	rm -f libkdmthemer_a.all_cpp.files libkdmthemer_a.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkdmthemer_a.all_cpp.final; \
-@@ -992,8 +995,8 @@
- kdmlabel.o: kdmlabel.moc 
- $(srcdir)/kdmitem.cpp: ../../config.ci 
- $(srcdir)/kdmlayout.cpp: ../../config.ci 
--kdmrect.o: kdmrect.moc 
- kdmpixmap.o: kdmpixmap.moc 
-+kdmrect.o: kdmrect.moc 
- kdmitem.lo: kdmitem.moc 
- kdmpixmap.lo: kdmpixmap.moc 
- nmcheck: 
 --- kdm/kfrontend/themes/circles/Makefile.in
 +++ kdm/kfrontend/themes/circles/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29591,7 +74900,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -563,7 +572,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29600,7 +74973,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29614,7 +74987,15 @@
  mostlyclean-libtool:
 --- kdm/kfrontend/themes/Makefile.in
 +++ kdm/kfrontend/themes/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29624,7 +75005,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -29633,7 +75078,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29647,7 +75092,15 @@
  mostlyclean-libtool:
 --- kdm/Makefile.in
 +++ kdm/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -278,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29657,7 +75110,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -328,6 +332,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -335,12 +340,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,10 +363,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -373,6 +378,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -534,6 +540,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -541,10 +548,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -29666,7 +75183,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29680,7 +75197,15 @@
  mostlyclean-libtool:
 --- kdmlib/Makefile.in
 +++ kdmlib/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -163,6 +163,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -307,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29690,7 +75215,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -357,6 +361,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -364,12 +369,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -390,10 +392,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -402,6 +407,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -563,6 +569,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -570,10 +577,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29699,7 +75288,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -658,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29713,7 +75302,15 @@
  	@$(NORMAL_INSTALL)
 --- kfind/Makefile.in
 +++ kfind/Makefile.in
-@@ -339,6 +339,9 @@
+@@ -195,6 +195,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -339,6 +340,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29723,7 +75320,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -656,7 +659,7 @@
+@@ -389,6 +393,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -396,12 +401,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -422,10 +424,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -595,6 +601,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -602,10 +609,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -656,7 +665,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29732,7 +75393,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -694,9 +697,9 @@
+@@ -694,9 +703,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29744,35 +75405,50 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1249,8 +1252,6 @@
+@@ -1249,23 +1258,23 @@
  
  #>+ 19
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-@@ -1259,13 +1260,15 @@
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfind.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 +	$(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfind.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
  
  #>+ 15
  force-reedit:
 --- kfind/pics/Makefile.in
 +++ kfind/pics/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29782,7 +75458,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29791,7 +75531,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29803,42 +75543,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,22 +738,22 @@
+@@ -735,22 +744,22 @@
  #>+ 19
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
--	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
--	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
  	$(INSTALL_DATA) $(srcdir)/lo22-action-delete.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
+ 	$(INSTALL_DATA) $(srcdir)/lo22-action-idea.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
 +	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
- 	$(INSTALL_DATA) $(srcdir)/lo22-action-idea.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
 +	$(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
--	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
--	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
++	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
 -	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
 -	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
  	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
+ 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
 +	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
-+	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
- 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
-+	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
 +	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
-+	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
  
  #>+ 15
  force-reedit:
 --- khelpcenter/htmlsearch/Makefile.in
 +++ khelpcenter/htmlsearch/Makefile.in
-@@ -330,6 +330,9 @@
+@@ -186,6 +186,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -330,6 +331,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29848,7 +75592,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -648,7 +651,7 @@
+@@ -380,6 +384,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -387,12 +392,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,10 +415,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -586,6 +592,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -593,10 +600,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -648,7 +657,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29857,7 +75665,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -686,9 +689,9 @@
+@@ -686,9 +695,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29871,7 +75679,15 @@
  	@$(NORMAL_INSTALL)
 --- khelpcenter/Makefile.in
 +++ khelpcenter/Makefile.in
-@@ -351,6 +351,9 @@
+@@ -207,6 +207,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -351,6 +352,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29881,7 +75697,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -695,7 +698,7 @@
+@@ -401,6 +405,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -408,12 +413,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -434,10 +436,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -607,6 +613,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -614,10 +621,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -695,7 +704,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29890,7 +75770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -733,9 +736,9 @@
+@@ -733,9 +742,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29902,42 +75782,187 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1308,11 +1311,11 @@
+@@ -1308,123 +1317,123 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
  
  #>+ 3
 -scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
 -	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
-+history.moc: $(srcdir)/history.h
-+	$(MOC) $(srcdir)/history.h -o history.moc
++glossary.moc: $(srcdir)/glossary.h
++	$(MOC) $(srcdir)/glossary.h -o glossary.moc
  
  #>+ 2
 -mocs: scrollkeepertreebuilder.moc
-+mocs: history.moc
++mocs: glossary.moc
  
  #>+ 3
- navigator.moc: $(srcdir)/navigator.h
-@@ -1322,11 +1325,11 @@
- mocs: navigator.moc
+-navigator.moc: $(srcdir)/navigator.h
+-	$(MOC) $(srcdir)/navigator.h -o navigator.moc
++infotree.moc: $(srcdir)/infotree.h
++	$(MOC) $(srcdir)/infotree.h -o infotree.moc
  
+ #>+ 2
+-mocs: navigator.moc
++mocs: infotree.moc
+ 
  #>+ 3
 -history.moc: $(srcdir)/history.h
 -	$(MOC) $(srcdir)/history.h -o history.moc
++htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
++	$(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
+ 
+ #>+ 2
+-mocs: history.moc
++mocs: htmlsearchconfig.moc
+ 
+ #>+ 3
+-fontdialog.moc: $(srcdir)/fontdialog.h
+-	$(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
++searchhandler.moc: $(srcdir)/searchhandler.h
++	$(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
+ 
+ #>+ 2
+-mocs: fontdialog.moc
++mocs: searchhandler.moc
+ 
+ #>+ 3
+-glossary.moc: $(srcdir)/glossary.h
+-	$(MOC) $(srcdir)/glossary.h -o glossary.moc
++htmlsearch.moc: $(srcdir)/htmlsearch.h
++	$(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
+ 
+ #>+ 2
+-mocs: glossary.moc
++mocs: htmlsearch.moc
+ 
+ #>+ 3
+-treebuilder.moc: $(srcdir)/treebuilder.h
+-	$(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
++view.moc: $(srcdir)/view.h
++	$(MOC) $(srcdir)/view.h -o view.moc
+ 
+ #>+ 2
+-mocs: treebuilder.moc
++mocs: view.moc
+ 
+ #>+ 3
+-infotree.moc: $(srcdir)/infotree.h
+-	$(MOC) $(srcdir)/infotree.h -o infotree.moc
++toc.moc: $(srcdir)/toc.h
++	$(MOC) $(srcdir)/toc.h -o toc.moc
+ 
+ #>+ 2
+-mocs: infotree.moc
++mocs: toc.moc
+ 
+ #>+ 3
+-htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
+-	$(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
++searchwidget.moc: $(srcdir)/searchwidget.h
++	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
+ 
+ #>+ 2
+-mocs: htmlsearchconfig.moc
++mocs: searchwidget.moc
+ 
+ #>+ 3
+-mainwindow.moc: $(srcdir)/mainwindow.h
+-	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
++khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
++	$(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
+ 
+ #>+ 2
+-mocs: mainwindow.moc
++mocs: khc_indexbuilder.moc
+ 
+ #>+ 3
+-searchhandler.moc: $(srcdir)/searchhandler.h
+-	$(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
++searchengine.moc: $(srcdir)/searchengine.h
++	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
+ 
+ #>+ 2
+-mocs: searchhandler.moc
++mocs: searchengine.moc
+ 
+ #>+ 3
+-kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
+-	$(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
++navigator.moc: $(srcdir)/navigator.h
++	$(MOC) $(srcdir)/navigator.h -o navigator.moc
+ 
+ #>+ 2
+-mocs: kcmhelpcenter.moc
++mocs: navigator.moc
+ 
+ #>+ 3
+-view.moc: $(srcdir)/view.h
+-	$(MOC) $(srcdir)/view.h -o view.moc
 +scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
 +	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
  
  #>+ 2
--mocs: history.moc
+-mocs: view.moc
 +mocs: scrollkeepertreebuilder.moc
  
  #>+ 3
- fontdialog.moc: $(srcdir)/fontdialog.h
-@@ -1437,10 +1440,10 @@
+-htmlsearch.moc: $(srcdir)/htmlsearch.h
+-	$(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
++history.moc: $(srcdir)/history.h
++	$(MOC) $(srcdir)/history.h -o history.moc
  
+ #>+ 2
+-mocs: htmlsearch.moc
++mocs: history.moc
+ 
  #>+ 3
+-toc.moc: $(srcdir)/toc.h
+-	$(MOC) $(srcdir)/toc.h -o toc.moc
++fontdialog.moc: $(srcdir)/fontdialog.h
++	$(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
+ 
+ #>+ 2
+-mocs: toc.moc
++mocs: fontdialog.moc
+ 
+ #>+ 3
+-searchwidget.moc: $(srcdir)/searchwidget.h
+-	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
++treebuilder.moc: $(srcdir)/treebuilder.h
++	$(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
+ 
+ #>+ 2
+-mocs: searchwidget.moc
++mocs: treebuilder.moc
+ 
+ #>+ 3
+-khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
+-	$(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
++mainwindow.moc: $(srcdir)/mainwindow.h
++	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
+ 
+ #>+ 2
+-mocs: khc_indexbuilder.moc
++mocs: mainwindow.moc
+ 
+ #>+ 3
+-searchengine.moc: $(srcdir)/searchengine.h
+-	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
++kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
++	$(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
+ 
+ #>+ 2
+-mocs: searchengine.moc
++mocs: kcmhelpcenter.moc
+ 
+ #>+ 8
+ khelpcenter.la.closure: $(khelpcenter_la_OBJECTS) $(khelpcenter_la_DEPENDENCIES)
+@@ -1437,10 +1446,10 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  scrollkeepertreebuilder.moc navigator.moc history.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
-+	-rm -f  history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
++	-rm -f  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc navigator.moc scrollkeepertreebuilder.moc history.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
  
  #>+ 2
 -KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h configure.in.in searchengine.h navigatorappitem.h history.h table-of-contents.xslt application.h formatter.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am 
@@ -29945,18 +75970,46 @@
  
  #>+ 6
  clean-idl:
-@@ -1500,7 +1503,7 @@
+@@ -1500,7 +1509,7 @@
  
  
  #>+ 11
 -libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc scrollkeepertreebuilder.moc navigator.moc history.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
-+libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
++libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc navigator.moc scrollkeepertreebuilder.moc history.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
  	@echo 'creating libkdeinit_khelpcenter_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_khelpcenter_la.all_cpp.files libkdeinit_khelpcenter_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_khelpcenter_la.all_cpp.final; \
+@@ -1562,8 +1571,8 @@
+ searchwidget.o: searchwidget.moc 
+ toc.lo: toc.moc 
+ $(srcdir)/htmlsearch.cpp: prefs.h 
+-toc.o: toc.moc 
+ treebuilder.lo: treebuilder.moc 
++toc.o: toc.moc 
+ $(srcdir)/history.cpp: prefs.h 
+ infotree.lo: infotree.moc 
+ htmlsearch.o: htmlsearch.moc 
+@@ -1610,8 +1619,8 @@
+ glossary.o: glossary.moc 
+ searchengine.lo: searchengine.moc 
+ history.lo: history.moc 
+-htmlsearchconfig.lo: htmlsearchconfig.moc 
+ kcmhelpcenter.lo: kcmhelpcenter.moc 
++htmlsearchconfig.lo: htmlsearchconfig.moc 
+ $(srcdir)/htmlsearchconfig.cpp: prefs.h 
+ infotree.o: infotree.moc 
+ mainwindow.o: mainwindow.moc 
 --- khelpcenter/pics/Makefile.in
 +++ khelpcenter/pics/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29966,7 +76019,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -545,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29975,7 +76092,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29987,7 +76104,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,29 +738,29 @@
+@@ -735,28 +744,28 @@
  
  #>+ 25
  install-kde-icons:
@@ -29995,40 +76112,47 @@
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
  	$(INSTALL_DATA) $(srcdir)/hi22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
  
  #>+ 15
- force-reedit:
 --- khelpcenter/plugins/Applications/Makefile.in
 +++ khelpcenter/plugins/Applications/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30038,7 +76162,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30047,7 +76235,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30061,7 +76249,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Makefile.in
 +++ khelpcenter/plugins/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30071,7 +76267,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -575,7 +584,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -30080,7 +76340,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30094,7 +76354,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Manpages/Makefile.in
 +++ khelpcenter/plugins/Manpages/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30104,7 +76372,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -556,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30113,7 +76445,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30127,7 +76459,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Scrollkeeper/Makefile.in
 +++ khelpcenter/plugins/Scrollkeeper/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30137,7 +76477,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30146,7 +76550,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30160,7 +76564,15 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Tutorials/Makefile.in
 +++ khelpcenter/plugins/Tutorials/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30170,7 +76582,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30179,7 +76655,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30193,7 +76669,15 @@
  mostlyclean-libtool:
 --- khelpcenter/searchhandlers/Makefile.in
 +++ khelpcenter/searchhandlers/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30203,7 +76687,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -565,7 +574,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30212,7 +76760,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -603,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30226,7 +76774,15 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 --- khotkeys/app/Makefile.in
 +++ khotkeys/app/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -182,6 +182,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -326,6 +327,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30236,7 +76792,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -643,7 +646,7 @@
+@@ -376,6 +380,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -383,12 +388,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -409,10 +411,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -582,6 +588,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -589,10 +596,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -643,7 +652,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30245,7 +76865,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -681,9 +684,9 @@
+@@ -681,9 +690,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30259,7 +76879,15 @@
  	@$(NORMAL_INSTALL)
 --- khotkeys/arts/Makefile.in
 +++ khotkeys/arts/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30269,7 +76897,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30278,7 +76970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30292,7 +76984,15 @@
  	@$(NORMAL_INSTALL)
 --- khotkeys/data/Makefile.in
 +++ khotkeys/data/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -263,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30302,7 +77002,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -313,6 +317,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -320,12 +325,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,10 +348,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -358,6 +363,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -519,6 +525,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -526,10 +533,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30311,7 +77075,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30325,7 +77089,15 @@
  mostlyclean-libtool:
 --- khotkeys/kcontrol/Makefile.in
 +++ khotkeys/kcontrol/Makefile.in
-@@ -341,6 +341,9 @@
+@@ -197,6 +197,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -341,6 +342,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30335,7 +77107,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -668,7 +671,7 @@
+@@ -391,6 +395,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -398,12 +403,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -424,10 +426,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -597,6 +603,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -604,10 +611,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -668,7 +677,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30344,7 +77180,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -706,9 +709,9 @@
+@@ -706,9 +715,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30356,115 +77192,146 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1162,13 +1165,6 @@
- mocs: gestures_settings_tab.moc
+@@ -1134,18 +1143,18 @@
  
+ 
  #>+ 3
--action_group_tab.moc: $(srcdir)/action_group_tab.h
--	$(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
--
--#>+ 2
--mocs: action_group_tab.moc
--
--#>+ 3
- gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
- 	$(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
+-gesturedrawer.moc: $(srcdir)/gesturedrawer.h
+-	$(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
++windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
++	$(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
  
-@@ -1176,11 +1172,11 @@
+ #>+ 2
+-mocs: gesturedrawer.moc
++mocs: windowdef_simple_widget.moc
+ 
+ #>+ 3
+-windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
+-	$(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
++gesturedrawer.moc: $(srcdir)/gesturedrawer.h
++	$(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
+ 
+ #>+ 2
+-mocs: windowdef_simple_widget.moc
++mocs: gesturedrawer.moc
+ 
+ #>+ 3
+ voicerecordpage.moc: $(srcdir)/voicerecordpage.h
+@@ -1176,18 +1185,18 @@
  mocs: gesture_triggers_tab.moc
  
  #>+ 3
 -kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
 -	$(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
-+action_group_tab.moc: $(srcdir)/action_group_tab.h
-+	$(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
++voicerecorder.moc: $(srcdir)/voicerecorder.h
++	$(MOC) $(srcdir)/voicerecorder.h -o voicerecorder.moc
  
  #>+ 2
 -mocs: kcmkhotkeys.moc
-+mocs: action_group_tab.moc
++mocs: voicerecorder.moc
  
  #>+ 3
- voicerecorder.moc: $(srcdir)/voicerecorder.h
-@@ -1190,6 +1186,13 @@
- mocs: voicerecorder.moc
- 
- #>+ 3
+-voicerecorder.moc: $(srcdir)/voicerecorder.h
+-	$(MOC) $(srcdir)/voicerecorder.h -o voicerecorder.moc
 +kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
 +	$(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: voicerecorder.moc
 +mocs: kcmkhotkeys.moc
-+
-+#>+ 3
+ 
+ #>+ 3
  tab_widget.moc: $(srcdir)/tab_widget.h
- 	$(MOC) $(srcdir)/tab_widget.h -o tab_widget.moc
+@@ -1197,18 +1206,18 @@
+ mocs: tab_widget.moc
  
-@@ -1225,6 +1228,13 @@
+ #>+ 3
+-dcop_widget.moc: $(srcdir)/dcop_widget.h
+-	$(MOC) $(srcdir)/dcop_widget.h -o dcop_widget.moc
++condition_list_widget.moc: $(srcdir)/condition_list_widget.h
++	$(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
+ 
+ #>+ 2
+-mocs: dcop_widget.moc
++mocs: condition_list_widget.moc
+ 
+ #>+ 3
+-condition_list_widget.moc: $(srcdir)/condition_list_widget.h
+-	$(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
++dcop_widget.moc: $(srcdir)/dcop_widget.h
++	$(MOC) $(srcdir)/dcop_widget.h -o dcop_widget.moc
+ 
+ #>+ 2
+-mocs: condition_list_widget.moc
++mocs: dcop_widget.moc
+ 
+ #>+ 3
+ actions_listview_widget.moc: $(srcdir)/actions_listview_widget.h
+@@ -1225,11 +1234,11 @@
  mocs: action_list_widget.moc
  
  #>+ 3
+-main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
+-	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
 +gesturerecorder.moc: $(srcdir)/gesturerecorder.h
 +	$(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: main_buttons_widget.moc
 +mocs: gesturerecorder.moc
-+
-+#>+ 3
- main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
- 	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
  
-@@ -1239,13 +1249,6 @@
+ #>+ 3
+ menuentry_widget.moc: $(srcdir)/menuentry_widget.h
+@@ -1239,11 +1248,11 @@
  mocs: menuentry_widget.moc
  
  #>+ 3
 -gesturerecorder.moc: $(srcdir)/gesturerecorder.h
 -	$(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
--
--#>+ 2
++main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
++	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
+ 
+ #>+ 2
 -mocs: gesturerecorder.moc
--
--#>+ 3
++mocs: main_buttons_widget.moc
+ 
+ #>+ 3
  general_tab.moc: $(srcdir)/general_tab.h
- 	$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
+@@ -1281,18 +1290,18 @@
+ mocs: windowselector.moc
  
-@@ -1274,6 +1277,13 @@
- mocs: gesturerecordpage.moc
- 
  #>+ 3
+-command_url_widget.moc: $(srcdir)/command_url_widget.h
+-	$(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
 +triggers_tab.moc: $(srcdir)/triggers_tab.h
 +	$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: command_url_widget.moc
 +mocs: triggers_tab.moc
-+
-+#>+ 3
- windowselector.moc: $(srcdir)/windowselector.h
- 	$(MOC) $(srcdir)/windowselector.h -o windowselector.moc
  
-@@ -1288,13 +1298,6 @@
- mocs: command_url_widget.moc
- 
  #>+ 3
 -triggers_tab.moc: $(srcdir)/triggers_tab.h
 -	$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
--
--#>+ 2
++command_url_widget.moc: $(srcdir)/command_url_widget.h
++	$(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
+ 
+ #>+ 2
 -mocs: triggers_tab.moc
--
--#>+ 3
++mocs: command_url_widget.moc
+ 
+ #>+ 3
  keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
- 	$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
+@@ -1333,7 +1342,7 @@
  
-@@ -1333,7 +1336,7 @@
- 
  #>+ 3
  clean-metasources:
 -	-rm -f  gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc windowselector.moc command_url_widget.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+	-rm -f  gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc main_buttons_widget.moc menuentry_widget.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc triggers_tab.moc windowselector.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++	-rm -f  windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc windowselector.moc triggers_tab.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
  
  #>+ 2
  KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am 
-@@ -1347,14 +1350,14 @@
+@@ -1347,14 +1356,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -30482,18 +77349,26 @@
  
  #>+ 15
  force-reedit:
-@@ -1395,7 +1398,7 @@
+@@ -1395,7 +1404,7 @@
  
  
  #>+ 11
 -kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp  windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc triggers_tab.moc command_url_widget.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp  windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc menuentry_widget.moc main_buttons_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc command_url_widget.moc windowselector.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp  gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc action_list_widget.moc actions_listview_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc command_url_widget.moc triggers_tab.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
  	@echo 'creating kcm_khotkeys_la.all_cpp.cpp ...'; \
  	rm -f kcm_khotkeys_la.all_cpp.files kcm_khotkeys_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
 --- khotkeys/kcontrol/ui/Makefile.in
 +++ khotkeys/kcontrol/ui/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -286,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30503,7 +77378,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -336,6 +340,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -343,12 +348,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,10 +371,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -542,6 +548,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -549,10 +556,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30512,7 +77451,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30524,18 +77463,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -873,7 +876,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui Makefile.in dcop_widget_ui.ui menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am 
-+KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui dcop_widget_ui.ui Makefile.in menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am 
- 
- #>+ 23
- clean-ui:
 --- khotkeys/Makefile.in
 +++ khotkeys/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -278,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30545,7 +77483,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -328,6 +332,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -335,12 +340,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,10 +363,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -373,6 +378,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -534,6 +540,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -541,10 +548,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -573,7 +582,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -30554,7 +77556,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30568,7 +77570,15 @@
  mostlyclean-libtool:
 --- khotkeys/shared/Makefile.in
 +++ khotkeys/shared/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30578,7 +77588,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30587,7 +77661,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30601,7 +77675,15 @@
  	@$(NORMAL_INSTALL)
 --- khotkeys/update/Makefile.in
 +++ khotkeys/update/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -286,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30611,7 +77693,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -336,6 +340,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -343,12 +348,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,10 +371,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -542,6 +548,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -549,10 +556,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30620,7 +77766,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30634,7 +77780,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/clock/Makefile.in
 +++ kicker/applets/clock/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30644,7 +77798,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30653,7 +77871,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30667,7 +77885,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/launcher/Makefile.in
 +++ kicker/applets/launcher/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -168,6 +168,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -312,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30677,7 +77903,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -362,6 +366,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -369,12 +374,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -395,10 +397,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -568,6 +574,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -575,10 +582,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -622,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30686,7 +77976,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30700,7 +77990,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/lockout/Makefile.in
 +++ kicker/applets/lockout/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30710,7 +78008,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30719,7 +78081,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30733,7 +78095,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/Makefile.in
 +++ kicker/applets/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30743,7 +78113,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -30752,7 +78186,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30766,7 +78200,15 @@
  mostlyclean-libtool:
 --- kicker/applets/media/Makefile.in
 +++ kicker/applets/media/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30776,7 +78218,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30785,7 +78291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30797,9 +78303,60 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -936,18 +945,18 @@
+ 
+ 
+ #>+ 3
+-mediaapplet.moc: $(srcdir)/mediaapplet.h
+-	$(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
++preferencesdialog.moc: $(srcdir)/preferencesdialog.h
++	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
+ 
+ #>+ 2
+-mocs: mediaapplet.moc
++mocs: preferencesdialog.moc
+ 
+ #>+ 3
+-preferencesdialog.moc: $(srcdir)/preferencesdialog.h
+-	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
++mediaapplet.moc: $(srcdir)/mediaapplet.h
++	$(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
+ 
+ #>+ 2
+-mocs: preferencesdialog.moc
++mocs: mediaapplet.moc
+ 
+ #>+ 3
+ mediumbutton.moc: $(srcdir)/mediumbutton.h
+@@ -958,7 +967,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  mediaapplet.moc preferencesdialog.moc mediumbutton.moc
++	-rm -f  preferencesdialog.moc mediaapplet.moc mediumbutton.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in mediaapplet.desktop Makefile.am 
+@@ -1009,7 +1018,7 @@
+ 
+ 
+ #>+ 11
+-media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp  preferencesdialog.moc mediaapplet.moc mediumbutton.moc
++media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp  mediaapplet.moc preferencesdialog.moc mediumbutton.moc
+ 	@echo 'creating media_panelapplet_la.all_cpp.cpp ...'; \
+ 	rm -f media_panelapplet_la.all_cpp.files media_panelapplet_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> media_panelapplet_la.all_cpp.final; \
 --- kicker/applets/menu/Makefile.in
 +++ kicker/applets/menu/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30809,7 +78366,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30818,7 +78439,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30832,7 +78453,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/minipager/Makefile.in
 +++ kicker/applets/minipager/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30842,7 +78471,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30851,7 +78544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30865,7 +78558,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/naughty/Makefile.in
 +++ kicker/applets/naughty/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -304,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30875,7 +78576,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -354,6 +358,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -361,12 +366,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,10 +389,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -560,6 +566,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -567,10 +574,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -616,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30884,7 +78649,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30898,7 +78663,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/run/Makefile.in
 +++ kicker/applets/run/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30908,7 +78681,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30917,7 +78754,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30931,7 +78768,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/swallow/Makefile.in
 +++ kicker/applets/swallow/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30941,7 +78786,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30950,7 +78859,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30962,7 +78871,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -934,22 +937,22 @@
+@@ -934,22 +943,22 @@
  
  
  #>+ 3
@@ -30992,7 +78901,7 @@
  
  #>+ 2
  KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am 
-@@ -1005,7 +1008,7 @@
+@@ -1005,7 +1014,7 @@
  
  
  #>+ 11
@@ -31001,7 +78910,7 @@
  	@echo 'creating swallow_panelapplet_la.all_cpp.cpp ...'; \
  	rm -f swallow_panelapplet_la.all_cpp.files swallow_panelapplet_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> swallow_panelapplet_la.all_cpp.final; \
-@@ -1045,8 +1048,8 @@
+@@ -1045,8 +1054,8 @@
  swallow.o: swallow.moc 
  $(srcdir)/prefwidget.cpp: prefwidgetbase.h 
  nmcheck-am: nmcheck
@@ -31013,7 +78922,15 @@
  
 --- kicker/applets/systemtray/Makefile.in
 +++ kicker/applets/systemtray/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31023,7 +78940,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31032,7 +79013,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31046,7 +79027,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/taskbar/Makefile.in
 +++ kicker/applets/taskbar/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31056,7 +79045,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31065,7 +79118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31079,7 +79132,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/trash/Makefile.in
 +++ kicker/applets/trash/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31089,7 +79150,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31098,7 +79223,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31112,7 +79237,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/data/app_start_anim/Makefile.in
 +++ kicker/data/app_start_anim/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31122,7 +79255,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31131,7 +79328,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31145,7 +79342,15 @@
  mostlyclean-libtool:
 --- kicker/data/icons/actions/Makefile.in
 +++ kicker/data/icons/actions/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31155,7 +79360,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31164,7 +79433,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31176,9 +79445,35 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -734,14 +743,14 @@
+ 
+ #>+ 10
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kickericonsdir)/locolor/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kickericonsdir)/locolor/16x16/actions/modified.png
++	$(mkinstalldirs) $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
+ 	-rm -f $(DESTDIR)$(kickericonsdir)/locolor/16x16/actions/modified.png
++	-rm -f $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
+ 
+ #>+ 15
+ force-reedit:
 --- kicker/data/icons/Makefile.in
 +++ kicker/data/icons/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31188,7 +79483,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31197,7 +79556,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31209,45 +79568,56 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -898,27 +901,27 @@
+@@ -898,27 +907,27 @@
  
  #>+ 23
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
  
  #>+ 15
  force-reedit:
 --- kicker/data/kmenu_side/Makefile.in
 +++ kicker/data/kmenu_side/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31257,7 +79627,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31266,7 +79700,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31280,7 +79714,15 @@
  mostlyclean-libtool:
 --- kicker/data/Makefile.in
 +++ kicker/data/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31290,7 +79732,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31299,7 +79805,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31313,7 +79819,15 @@
  mostlyclean-libtool:
 --- kicker/data/tiles/Makefile.in
 +++ kicker/data/tiles/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31323,7 +79837,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31332,7 +79910,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31344,18 +79922,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -806,7 +809,7 @@
+@@ -806,7 +815,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_tigereye_tiny_up.png solid_gray_large_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png light_pastel_normal_up.png solid_gray_normal_down.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
-+KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_gray_large_up.png solid_tigereye_tiny_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png solid_gray_normal_down.png light_pastel_normal_up.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
++KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png solid_tigereye_normal_down.png KDE_button_tiny_up.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_gray_large_up.png solid_tigereye_tiny_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png light_pastel_large_down.png solid_gray_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png light_pastel_normal_up.png solid_gray_normal_down.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
  
  #>+ 2
  docs-am:
 --- kicker/data/wallpaper/Makefile.in
 +++ kicker/data/wallpaper/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31365,7 +79951,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -31374,7 +80024,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31388,7 +80038,15 @@
  mostlyclean-libtool:
 --- kicker/extensions/dockbar/Makefile.in
 +++ kicker/extensions/dockbar/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31398,7 +80056,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31407,7 +80129,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31421,7 +80143,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/extensions/kasbar/Makefile.in
 +++ kicker/extensions/kasbar/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -179,6 +179,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -323,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31431,7 +80161,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -655,7 +658,7 @@
+@@ -373,6 +377,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -380,12 +385,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,10 +408,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -418,6 +423,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -579,6 +585,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -586,10 +593,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -655,7 +664,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31440,7 +80234,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -693,9 +696,9 @@
+@@ -693,9 +702,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31452,46 +80246,51 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1102,6 +1105,13 @@
+@@ -1102,18 +1111,18 @@
  mocs: kasbarextension.moc
  
  #>+ 3
-+kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
-+	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
-+
-+#>+ 2
-+mocs: kasaboutdlg.moc
-+
-+#>+ 3
- kasclockitem.moc: $(srcdir)/kasclockitem.h
- 	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
+-kasclockitem.moc: $(srcdir)/kasclockitem.h
+-	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
++kasitem.moc: $(srcdir)/kasitem.h
++	$(MOC) $(srcdir)/kasitem.h -o kasitem.moc
  
-@@ -1116,13 +1126,6 @@
- mocs: kasitem.moc
+ #>+ 2
+-mocs: kasclockitem.moc
++mocs: kasitem.moc
  
  #>+ 3
--kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
--	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
--
--#>+ 2
--mocs: kasaboutdlg.moc
--
--#>+ 3
- kasresources.moc: $(srcdir)/kasresources.h
- 	$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
+-kasitem.moc: $(srcdir)/kasitem.h
+-	$(MOC) $(srcdir)/kasitem.h -o kasitem.moc
++kasclockitem.moc: $(srcdir)/kasclockitem.h
++	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
  
-@@ -1182,7 +1185,7 @@
+ #>+ 2
+-mocs: kasitem.moc
++mocs: kasclockitem.moc
  
  #>+ 3
+ kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
+@@ -1182,7 +1191,7 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasclockitem.moc kasitem.moc kasaboutdlg.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
-+	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasaboutdlg.moc kasclockitem.moc kasitem.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
++	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasitem.moc kasclockitem.moc kasaboutdlg.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
  
  #>+ 2
  KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am 
 --- kicker/extensions/Makefile.in
 +++ kicker/extensions/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31501,7 +80300,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -31510,7 +80373,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31524,7 +80387,15 @@
  mostlyclean-libtool:
 --- kicker/extensions/sidebar/Makefile.in
 +++ kicker/extensions/sidebar/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31534,7 +80405,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31543,7 +80478,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31557,7 +80492,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/extensions/taskbar/Makefile.in
 +++ kicker/extensions/taskbar/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31567,7 +80510,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31576,7 +80583,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31590,7 +80597,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/kicker/buttons/Makefile.in
 +++ kicker/kicker/buttons/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31600,7 +80615,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -612,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31609,7 +80688,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31621,42 +80700,65 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -960,11 +963,11 @@
+@@ -939,18 +948,18 @@
+ mocs: urlbutton.moc
+ 
+ #>+ 3
+-extensionbutton.moc: $(srcdir)/extensionbutton.h
+-	$(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
++windowlistbutton.moc: $(srcdir)/windowlistbutton.h
++	$(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
+ 
+ #>+ 2
+-mocs: extensionbutton.moc
++mocs: windowlistbutton.moc
+ 
+ #>+ 3
+-windowlistbutton.moc: $(srcdir)/windowlistbutton.h
+-	$(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
++extensionbutton.moc: $(srcdir)/extensionbutton.h
++	$(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
+ 
+ #>+ 2
+-mocs: windowlistbutton.moc
++mocs: extensionbutton.moc
+ 
+ #>+ 3
+ servicebutton.moc: $(srcdir)/servicebutton.h
+@@ -960,6 +969,13 @@
  mocs: servicebutton.moc
  
  #>+ 3
--kbutton.moc: $(srcdir)/kbutton.h
--	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
 +desktopbutton.moc: $(srcdir)/desktopbutton.h
 +	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
- 
- #>+ 2
--mocs: kbutton.moc
++
++#>+ 2
 +mocs: desktopbutton.moc
++
++#>+ 3
+ kbutton.moc: $(srcdir)/kbutton.h
+ 	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
  
- #>+ 3
- servicemenubutton.moc: $(srcdir)/servicemenubutton.h
-@@ -974,11 +977,11 @@
+@@ -974,13 +990,6 @@
  mocs: servicemenubutton.moc
  
  #>+ 3
 -desktopbutton.moc: $(srcdir)/desktopbutton.h
 -	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
-+kbutton.moc: $(srcdir)/kbutton.h
-+	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: desktopbutton.moc
-+mocs: kbutton.moc
- 
- #>+ 3
+-
+-#>+ 3
  nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
-@@ -996,10 +999,10 @@
+ 	$(MOC) $(srcdir)/nonkdeappbutton.h -o nonkdeappbutton.moc
  
+@@ -996,10 +1005,10 @@
+ 
  #>+ 3
  clean-metasources:
 -	-rm -f  browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+	-rm -f  browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++	-rm -f  browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc kbutton.moc servicemenubutton.moc nonkdeappbutton.moc bookmarksbutton.moc
  
  #>+ 2
 -KDE_DIST=servicemenubutton.h servicebutton.h kmenu.desktop windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarks.desktop bookmarksbutton.h extensionbutton.h browserbutton.h desktop.desktop browser.desktop kbutton.h exec.desktop Makefile.am windowlist.desktop 
@@ -31664,16 +80766,16 @@
  
  #>+ 2
  docs-am:
-@@ -1043,7 +1046,7 @@
+@@ -1043,7 +1052,7 @@
  
  
  #>+ 11
 -libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp  browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp  browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp  browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc servicemenubutton.moc kbutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
  	@echo 'creating libkicker_buttons_la.all_cpp.cpp ...'; \
  	rm -f libkicker_buttons_la.all_cpp.files libkicker_buttons_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkicker_buttons_la.all_cpp.final; \
-@@ -1082,8 +1085,8 @@
+@@ -1082,8 +1091,8 @@
  extensionbutton.o: extensionbutton.moc 
  urlbutton.o: urlbutton.moc 
  nonkdeappbutton.lo: nonkdeappbutton.moc 
@@ -31685,7 +80787,15 @@
  kbutton.o: kbutton.moc 
 --- kicker/kicker/core/Makefile.in
 +++ kicker/kicker/core/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -308,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31695,7 +80805,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -358,6 +362,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -365,12 +370,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,10 +393,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -564,6 +570,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -571,10 +578,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -631,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31704,7 +80878,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +672,9 @@
+@@ -669,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31716,32 +80890,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -985,18 +988,18 @@
- 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
+@@ -1013,18 +1022,18 @@
+ mocs: applethandle.moc
  
  #>+ 3
--container_extension.moc: $(srcdir)/container_extension.h
--	$(MOC) $(srcdir)/container_extension.h -o container_extension.moc
-+container_base.moc: $(srcdir)/container_base.h
-+	$(MOC) $(srcdir)/container_base.h -o container_base.moc
+-containerarea.moc: $(srcdir)/containerarea.h
+-	$(MOC) $(srcdir)/containerarea.h -o containerarea.moc
++menumanager.moc: $(srcdir)/menumanager.h
++	$(MOC) $(srcdir)/menumanager.h -o menumanager.moc
  
  #>+ 2
--mocs: container_extension.moc
-+mocs: container_base.moc
+-mocs: containerarea.moc
++mocs: menumanager.moc
  
  #>+ 3
--container_base.moc: $(srcdir)/container_base.h
--	$(MOC) $(srcdir)/container_base.h -o container_base.moc
-+container_extension.moc: $(srcdir)/container_extension.h
-+	$(MOC) $(srcdir)/container_extension.h -o container_extension.moc
+-menumanager.moc: $(srcdir)/menumanager.h
+-	$(MOC) $(srcdir)/menumanager.h -o menumanager.moc
++containerarea.moc: $(srcdir)/containerarea.h
++	$(MOC) $(srcdir)/containerarea.h -o containerarea.moc
  
  #>+ 2
--mocs: container_base.moc
-+mocs: container_extension.moc
+-mocs: menumanager.moc
++mocs: containerarea.moc
  
  #>+ 3
- container_applet.moc: $(srcdir)/container_applet.h
-@@ -1034,18 +1037,18 @@
+ pluginmanager.moc: $(srcdir)/pluginmanager.h
+@@ -1034,18 +1043,18 @@
  mocs: pluginmanager.moc
  
  #>+ 3
@@ -31766,52 +80940,35 @@
  
  #>+ 3
  showdesktop.moc: $(srcdir)/showdesktop.h
-@@ -1062,18 +1065,18 @@
- mocs: extensionmanager.moc
+@@ -1084,7 +1093,7 @@
  
  #>+ 3
--kicker.moc: $(srcdir)/kicker.h
--	$(MOC) $(srcdir)/kicker.h -o kicker.moc
-+panelextension.moc: $(srcdir)/panelextension.h
-+	$(MOC) $(srcdir)/panelextension.h -o panelextension.moc
- 
- #>+ 2
--mocs: kicker.moc
-+mocs: panelextension.moc
- 
- #>+ 3
--panelextension.moc: $(srcdir)/panelextension.h
--	$(MOC) $(srcdir)/panelextension.h -o panelextension.moc
-+kicker.moc: $(srcdir)/kicker.h
-+	$(MOC) $(srcdir)/kicker.h -o kicker.moc
- 
- #>+ 2
--mocs: panelextension.moc
-+mocs: kicker.moc
- 
- #>+ 3
- userrectsel.moc: $(srcdir)/userrectsel.h
-@@ -1084,7 +1087,7 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  container_extension.moc container_base.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
-+	-rm -f  container_base.moc container_extension.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
++	-rm -f  container_extension.moc container_base.moc container_applet.moc applethandle.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
  
  #>+ 2
  KDE_DIST=extensionmanager.h kicker.h container_extension.h showdesktop.h menumanager.h container_button.h Makefile.in panelextension.h default-apps extensionSettings.kcfgc childpanelextension.desktop unhidetrigger.h applethandle.h container_base.h extensionSettings.kcfg kickerbindings.cpp pluginmanager.h containerarea.h containerarealayout.h container_applet.h userrectsel.h Makefile.am 
-@@ -1142,7 +1145,7 @@
+@@ -1142,7 +1151,7 @@
  
  
  #>+ 11
 -libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp  ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp  ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp  ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp  ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp  container_base.moc container_extension.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
-+libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp  ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp  ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp  ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp  ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp  container_extension.moc container_base.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
++libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp  ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp  ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp  ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp  ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp  container_base.moc container_extension.moc applethandle.moc container_applet.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
  	@echo 'creating libkicker_core_la.all_cpp.cpp ...'; \
  	rm -f libkicker_core_la.all_cpp.files libkicker_core_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
 --- kicker/kicker/Makefile.in
 +++ kicker/kicker/Makefile.in
-@@ -346,6 +346,9 @@
+@@ -202,6 +202,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -346,6 +347,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31821,7 +80978,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -662,7 +665,7 @@
+@@ -396,6 +400,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -403,12 +408,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -429,10 +431,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -602,6 +608,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -609,10 +616,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -662,7 +671,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31830,7 +81051,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -700,9 +703,9 @@
+@@ -700,9 +709,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31844,7 +81065,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/kicker/ui/Makefile.in
 +++ kicker/kicker/ui/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31854,7 +81083,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -631,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31863,7 +81156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +672,9 @@
+@@ -669,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31875,80 +81168,78 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -953,11 +956,11 @@
+@@ -953,6 +962,13 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub k_mnu.kidl
  
  #>+ 3
--appletwidget.moc: $(srcdir)/appletwidget.h
--	$(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
 +addapplet.moc: $(srcdir)/addapplet.h
 +	$(MOC) $(srcdir)/addapplet.h -o addapplet.moc
- 
- #>+ 2
--mocs: appletwidget.moc
++
++#>+ 2
 +mocs: addapplet.moc
++
++#>+ 3
+ appletwidget.moc: $(srcdir)/appletwidget.h
+ 	$(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
  
- #>+ 3
- exe_dlg.moc: $(srcdir)/exe_dlg.h
-@@ -967,11 +970,11 @@
+@@ -967,13 +983,6 @@
  mocs: exe_dlg.moc
  
  #>+ 3
 -addapplet.moc: $(srcdir)/addapplet.h
 -	$(MOC) $(srcdir)/addapplet.h -o addapplet.moc
-+appletwidget.moc: $(srcdir)/appletwidget.h
-+	$(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: addapplet.moc
-+mocs: appletwidget.moc
+-
+-#>+ 3
+ hidebutton.moc: $(srcdir)/hidebutton.h
+ 	$(MOC) $(srcdir)/hidebutton.h -o hidebutton.moc
  
+@@ -1058,18 +1067,18 @@
+ mocs: removebutton_mnu.moc
+ 
  #>+ 3
- hidebutton.moc: $(srcdir)/hidebutton.h
-@@ -1065,18 +1068,18 @@
- mocs: addappletvisualfeedback.moc
+-addappletvisualfeedback.moc: $(srcdir)/addappletvisualfeedback.h
+-	$(MOC) $(srcdir)/addappletvisualfeedback.h -o addappletvisualfeedback.moc
++client_mnu.moc: $(srcdir)/client_mnu.h
++	$(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
  
+ #>+ 2
+-mocs: addappletvisualfeedback.moc
++mocs: client_mnu.moc
+ 
  #>+ 3
 -client_mnu.moc: $(srcdir)/client_mnu.h
 -	$(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
-+quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
-+	$(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
++addappletvisualfeedback.moc: $(srcdir)/addappletvisualfeedback.h
++	$(MOC) $(srcdir)/addappletvisualfeedback.h -o addappletvisualfeedback.moc
  
  #>+ 2
 -mocs: client_mnu.moc
-+mocs: quickbrowser_mnu.moc
++mocs: addappletvisualfeedback.moc
  
  #>+ 3
--quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
--	$(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
-+client_mnu.moc: $(srcdir)/client_mnu.h
-+	$(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
+ quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
+@@ -1087,7 +1096,7 @@
  
- #>+ 2
--mocs: quickbrowser_mnu.moc
-+mocs: client_mnu.moc
- 
  #>+ 3
- addextension_mnu.moc: $(srcdir)/addextension_mnu.h
-@@ -1087,7 +1090,7 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  appletwidget.moc exe_dlg.moc addapplet.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc client_mnu.moc quickbrowser_mnu.moc addextension_mnu.moc
-+	-rm -f  addapplet.moc exe_dlg.moc appletwidget.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc quickbrowser_mnu.moc client_mnu.moc addextension_mnu.moc
++	-rm -f  addapplet.moc appletwidget.moc exe_dlg.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc client_mnu.moc addappletvisualfeedback.moc quickbrowser_mnu.moc addextension_mnu.moc
  
  #>+ 2
  KDE_DIST=Makefile.in appletitem.ui nonKDEButtonSettings.ui panelmenuiteminfo.h appletview.ui Makefile.am 
-@@ -1146,7 +1149,7 @@
+@@ -1146,7 +1155,7 @@
  
  
  #>+ 11
 -libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp  addapplet.moc exe_dlg.moc appletwidget.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
-+libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp  appletwidget.moc exe_dlg.moc addapplet.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
++libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp  exe_dlg.moc appletwidget.moc addapplet.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc quickbrowser_mnu.moc addappletvisualfeedback.moc client_mnu.moc addextension_mnu.moc
  	@echo 'creating libkicker_ui_la.all_cpp.cpp ...'; \
  	rm -f libkicker_ui_la.all_cpp.files libkicker_ui_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
-@@ -1187,7 +1190,7 @@
+@@ -1187,7 +1196,7 @@
  addappletvisualfeedback.o: addappletvisualfeedback.moc 
  addextension_mnu.o: addextension_mnu.moc 
  browser_dlg.lo: browser_dlg.moc 
@@ -31957,7 +81248,7 @@
  appletop_mnu.o: appletop_mnu.moc 
  $(srcdir)/extensionop_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
  $(srcdir)/addappletvisualfeedback.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
-@@ -1197,7 +1200,7 @@
+@@ -1197,7 +1206,7 @@
  $(srcdir)/removecontainer_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
  $(srcdir)/removeextension_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
  addbutton_mnu.o: addbutton_mnu.moc 
@@ -31968,7 +81259,15 @@
  $(srcdir)/removeapplet_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
 --- kicker/libkicker/Makefile.in
 +++ kicker/libkicker/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31978,7 +81277,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -612,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31987,7 +81350,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31999,58 +81362,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -960,22 +963,22 @@
- mocs: panelbutton.moc
- 
- #>+ 3
--simplebutton.moc: $(srcdir)/simplebutton.h
--	$(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
-+kickertip.moc: $(srcdir)/kickertip.h
-+	$(MOC) $(srcdir)/kickertip.h -o kickertip.moc
- 
- #>+ 2
--mocs: simplebutton.moc
-+mocs: kickertip.moc
- 
- #>+ 3
--kickertip.moc: $(srcdir)/kickertip.h
--	$(MOC) $(srcdir)/kickertip.h -o kickertip.moc
-+simplebutton.moc: $(srcdir)/simplebutton.h
-+	$(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
- 
- #>+ 2
--mocs: kickertip.moc
-+mocs: simplebutton.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  panner.moc panelbutton.moc simplebutton.moc kickertip.moc
-+	-rm -f  panner.moc panelbutton.moc kickertip.moc simplebutton.moc
- 
- #>+ 2
- KDE_DIST=menuinfo.h paneldrag.h simplebutton.h global.h panelbutton.h Makefile.in kickerSettings.kcfgc kickertip.h kshadowengine.h panner.h kshadowsettings.h kickerSettings.kcfg appletinfo.h Makefile.am 
-@@ -1031,7 +1034,7 @@
- 
- 
- #>+ 11
--libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp  panner.moc panelbutton.moc kickertip.moc simplebutton.moc
-+libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp  panner.moc panelbutton.moc simplebutton.moc kickertip.moc
- 	@echo 'creating libkickermain_la.all_cpp.cpp ...'; \
- 	rm -f libkickermain_la.all_cpp.files libkickermain_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkickermain_la.all_cpp.final; \
-@@ -1085,8 +1088,8 @@
- simplebutton.lo: simplebutton.moc 
- $(srcdir)/simplebutton.cpp: kickerSettings.h 
- $(srcdir)/paneldrag.cpp: kickerSettings.h 
--$(srcdir)/panelbutton.cpp: kickerSettings.h 
- panner.lo: panner.moc 
-+$(srcdir)/panelbutton.cpp: kickerSettings.h 
- 
- #>+ 6
- kickerSettings.cpp: kickerSettings.h
 --- kicker/Makefile.in
 +++ kicker/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -124,6 +124,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -268,6 +269,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32060,7 +81382,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -318,6 +322,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -325,12 +330,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,10 +353,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -363,6 +368,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -524,6 +530,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -531,10 +538,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32069,7 +81455,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32083,7 +81469,15 @@
  mostlyclean-libtool:
 --- kicker/menuext/find/Makefile.in
 +++ kicker/menuext/find/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32093,7 +81487,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32102,7 +81560,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32116,7 +81574,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/kdeprint/Makefile.in
 +++ kicker/menuext/kdeprint/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32126,7 +81592,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32135,7 +81665,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32149,7 +81679,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/konq-profiles/Makefile.in
 +++ kicker/menuext/konq-profiles/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32159,7 +81697,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -596,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32168,7 +81770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32182,7 +81784,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/konsole/Makefile.in
 +++ kicker/menuext/konsole/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32192,7 +81802,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32201,7 +81875,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32215,7 +81889,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/Makefile.in
 +++ kicker/menuext/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32225,7 +81907,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32234,7 +81980,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32248,7 +81994,15 @@
  mostlyclean-libtool:
 --- kicker/menuext/prefmenu/Makefile.in
 +++ kicker/menuext/prefmenu/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32258,7 +82012,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32267,7 +82085,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32281,7 +82099,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/recentdocs/Makefile.in
 +++ kicker/menuext/recentdocs/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32291,7 +82117,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32300,7 +82190,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32314,7 +82204,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/remote/Makefile.in
 +++ kicker/menuext/remote/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32324,7 +82222,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32333,7 +82295,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32347,7 +82309,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/system/Makefile.in
 +++ kicker/menuext/system/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32357,7 +82327,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32366,7 +82400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32380,7 +82414,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/tom/Makefile.in
 +++ kicker/menuext/tom/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32390,7 +82432,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -32399,7 +82505,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32413,7 +82519,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/proxy/Makefile.in
 +++ kicker/proxy/Makefile.in
-@@ -328,6 +328,9 @@
+@@ -184,6 +184,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -328,6 +329,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32423,7 +82537,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -378,6 +382,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -385,12 +390,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,10 +413,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -423,6 +428,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -584,6 +590,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -591,10 +598,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -639,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32432,7 +82610,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -677,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32444,43 +82622,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1063,18 +1066,18 @@
- extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
- 
- #>+ 3
--appletproxy.moc: $(srcdir)/appletproxy.h
--	$(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
-+extensionproxy.moc: $(srcdir)/extensionproxy.h
-+	$(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
- 
- #>+ 2
--mocs: appletproxy.moc
-+mocs: extensionproxy.moc
- 
- #>+ 3
--extensionproxy.moc: $(srcdir)/extensionproxy.h
--	$(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
-+appletproxy.moc: $(srcdir)/appletproxy.h
-+	$(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
- 
- #>+ 2
--mocs: extensionproxy.moc
-+mocs: appletproxy.moc
- 
- #>+ 3
- extensiondebugger.moc: $(srcdir)/extensiondebugger.h
-@@ -1085,7 +1088,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  appletproxy.moc extensionproxy.moc extensiondebugger.moc
-+	-rm -f  extensionproxy.moc appletproxy.moc extensiondebugger.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am 
 --- kicker/taskbar/Makefile.in
 +++ kicker/taskbar/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32490,7 +82642,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32499,7 +82715,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32513,7 +82729,15 @@
  	@$(NORMAL_INSTALL)
 --- kicker/taskmanager/Makefile.in
 +++ kicker/taskmanager/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32523,7 +82747,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32532,7 +82820,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32544,9 +82832,56 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -912,22 +921,22 @@
+ mocs: tasklmbmenu.moc
+ 
+ #>+ 3
+-taskrmbmenu.moc: $(srcdir)/taskrmbmenu.h
+-	$(MOC) $(srcdir)/taskrmbmenu.h -o taskrmbmenu.moc
++taskmanager.moc: $(srcdir)/taskmanager.h
++	$(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
+ 
+ #>+ 2
+-mocs: taskrmbmenu.moc
++mocs: taskmanager.moc
+ 
+ #>+ 3
+-taskmanager.moc: $(srcdir)/taskmanager.h
+-	$(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
++taskrmbmenu.moc: $(srcdir)/taskrmbmenu.h
++	$(MOC) $(srcdir)/taskrmbmenu.h -o taskrmbmenu.moc
+ 
+ #>+ 2
+-mocs: taskmanager.moc
++mocs: taskrmbmenu.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  tasklmbmenu.moc taskrmbmenu.moc taskmanager.moc
++	-rm -f  tasklmbmenu.moc taskmanager.moc taskrmbmenu.moc
+ 
+ #>+ 2
+ KDE_DIST=taskrmbmenu.h Makefile.in taskmanager.h configure.in.in tasklmbmenu.h Makefile.am 
+@@ -978,7 +987,7 @@
+ 
+ 
+ #>+ 11
+-libtaskmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tasklmbmenu.cpp $(srcdir)/taskrmbmenu.cpp $(srcdir)/taskmanager.cpp  tasklmbmenu.moc taskmanager.moc taskrmbmenu.moc
++libtaskmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tasklmbmenu.cpp $(srcdir)/taskrmbmenu.cpp $(srcdir)/taskmanager.cpp  tasklmbmenu.moc taskrmbmenu.moc taskmanager.moc
+ 	@echo 'creating libtaskmanager_la.all_cpp.cpp ...'; \
+ 	rm -f libtaskmanager_la.all_cpp.files libtaskmanager_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libtaskmanager_la.all_cpp.final; \
 --- kioslave/about/Makefile.in
 +++ kioslave/about/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32556,7 +82891,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32565,7 +82964,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32579,7 +82978,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/cgi/kcmcgi/Makefile.in
 +++ kioslave/cgi/kcmcgi/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32589,7 +82996,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32598,7 +83069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32612,7 +83083,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/cgi/Makefile.in
 +++ kioslave/cgi/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -311,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32622,7 +83101,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -361,6 +365,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -368,12 +373,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -394,10 +396,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -406,6 +411,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -567,6 +573,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -574,10 +581,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32631,7 +83174,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32645,7 +83188,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/filter/Makefile.in
 +++ kioslave/filter/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32655,7 +83206,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -32664,7 +83279,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32678,7 +83293,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/finger/Makefile.in
 +++ kioslave/finger/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32688,7 +83311,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32697,7 +83384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32711,7 +83398,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/fish/Makefile.in
 +++ kioslave/fish/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32721,7 +83416,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32730,7 +83489,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32744,7 +83503,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/floppy/Makefile.in
 +++ kioslave/floppy/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32754,7 +83521,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32763,7 +83594,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32777,7 +83608,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/home/kdedmodule/Makefile.in
 +++ kioslave/home/kdedmodule/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32787,7 +83626,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32796,7 +83699,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32810,7 +83713,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/home/Makefile.in
 +++ kioslave/home/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -324,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32820,7 +83731,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -632,7 +635,7 @@
+@@ -374,6 +378,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -381,12 +386,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,10 +409,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -580,6 +586,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -587,10 +594,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -632,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32829,7 +83804,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -670,9 +673,9 @@
+@@ -670,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32843,7 +83818,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/info/Makefile.in
 +++ kioslave/info/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32853,7 +83836,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -32862,7 +83909,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32876,7 +83923,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/ldap/Makefile.in
 +++ kioslave/ldap/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32886,7 +83941,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32895,7 +84014,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32909,7 +84028,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/mac/Makefile.in
 +++ kioslave/mac/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32919,7 +84046,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32928,7 +84119,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32940,7 +84131,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -955,14 +958,14 @@
+@@ -955,14 +964,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -32960,7 +84151,15 @@
  force-reedit:
 --- kioslave/Makefile.in
 +++ kioslave/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -125,6 +125,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -269,6 +270,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32970,7 +84169,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -319,6 +323,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -326,12 +331,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,10 +354,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -364,6 +369,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -525,6 +531,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -532,10 +539,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -566,7 +575,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32979,7 +84242,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -604,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32993,7 +84256,15 @@
  mostlyclean-libtool:
 --- kioslave/man/Makefile.in
 +++ kioslave/man/Makefile.in
-@@ -321,6 +321,9 @@
+@@ -177,6 +177,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -321,6 +322,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33003,7 +84274,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -640,7 +643,7 @@
+@@ -371,6 +375,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -378,12 +383,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -404,10 +406,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -577,6 +583,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -584,10 +591,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -640,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33012,7 +84347,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -678,9 +681,9 @@
+@@ -678,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33026,7 +84361,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/kcmodule/Makefile.in
 +++ kioslave/media/kcmodule/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33036,7 +84379,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -617,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33045,7 +84452,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33057,9 +84464,60 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -950,18 +959,18 @@
+ 
+ 
+ #>+ 3
+-serviceconfigdialog.moc: $(srcdir)/serviceconfigdialog.h
+-	$(MOC) $(srcdir)/serviceconfigdialog.h -o serviceconfigdialog.moc
++managermodule.moc: $(srcdir)/managermodule.h
++	$(MOC) $(srcdir)/managermodule.h -o managermodule.moc
+ 
+ #>+ 2
+-mocs: serviceconfigdialog.moc
++mocs: managermodule.moc
+ 
+ #>+ 3
+-managermodule.moc: $(srcdir)/managermodule.h
+-	$(MOC) $(srcdir)/managermodule.h -o managermodule.moc
++serviceconfigdialog.moc: $(srcdir)/serviceconfigdialog.h
++	$(MOC) $(srcdir)/serviceconfigdialog.h -o serviceconfigdialog.moc
+ 
+ #>+ 2
+-mocs: managermodule.moc
++mocs: serviceconfigdialog.moc
+ 
+ #>+ 3
+ notifiermodule.moc: $(srcdir)/notifiermodule.h
+@@ -979,7 +988,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  serviceconfigdialog.moc managermodule.moc notifiermodule.moc main.moc
++	-rm -f  managermodule.moc serviceconfigdialog.moc notifiermodule.moc main.moc
+ 
+ #>+ 2
+ KDE_DIST=serviceview.ui notifiermoduleview.ui Makefile.in managermoduleview.ui media.desktop Makefile.am 
+@@ -1037,7 +1046,7 @@
+ 
+ 
+ #>+ 11
+-kcm_media_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/notifiermodule.cpp $(srcdir)/serviceconfigdialog.cpp $(srcdir)/mimetypelistboxitem.cpp $(srcdir)/managermodule.cpp $(srcdir)/main.cpp notifiermoduleview.cpp serviceview.cpp managermoduleview.cpp  managermoduleview.moc managermodule.moc serviceconfigdialog.moc serviceview.moc notifiermoduleview.moc main.moc notifiermodule.moc
++kcm_media_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/notifiermodule.cpp $(srcdir)/serviceconfigdialog.cpp $(srcdir)/mimetypelistboxitem.cpp $(srcdir)/managermodule.cpp $(srcdir)/main.cpp notifiermoduleview.cpp serviceview.cpp managermoduleview.cpp  managermoduleview.moc serviceconfigdialog.moc managermodule.moc serviceview.moc notifiermoduleview.moc main.moc notifiermodule.moc
+ 	@echo 'creating kcm_media_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_media_la.all_cpp.files kcm_media_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_media_la.all_cpp.final; \
 --- kioslave/media/kfile-plugin/Makefile.in
 +++ kioslave/media/kfile-plugin/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -154,6 +154,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -298,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33069,7 +84527,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -348,6 +352,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -355,12 +360,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -381,10 +383,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -554,6 +560,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -561,10 +568,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33078,7 +84600,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33092,7 +84614,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/libmediacommon/Makefile.in
 +++ kioslave/media/libmediacommon/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33102,7 +84632,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33111,7 +84705,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33125,7 +84719,15 @@
  clean-noinstLTLIBRARIES:
 --- kioslave/media/Makefile.in
 +++ kioslave/media/Makefile.in
-@@ -325,6 +325,9 @@
+@@ -181,6 +181,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -325,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33135,7 +84737,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -636,7 +639,7 @@
+@@ -375,6 +379,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -382,12 +387,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,10 +410,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -581,6 +587,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -588,10 +595,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -636,7 +645,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33144,7 +84810,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +677,9 @@
+@@ -674,9 +683,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33158,7 +84824,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/mediamanager/Makefile.in
 +++ kioslave/media/mediamanager/Makefile.in
-@@ -334,6 +334,9 @@
+@@ -190,6 +190,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -334,6 +335,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33168,7 +84842,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -645,7 +648,7 @@
+@@ -384,6 +388,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -391,12 +396,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -417,10 +419,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -590,6 +596,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -597,10 +604,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -645,7 +654,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33177,7 +84915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -683,9 +686,9 @@
+@@ -683,9 +692,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33189,18 +84927,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1035,7 +1038,7 @@
- 	-rm -f  removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
- 
- #>+ 2
--KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
-+KDE_DIST=fstabbackend.h linuxcdpolling.h mediadirnotify.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
- 
- #>+ 5
- clean-idl:
 --- kioslave/media/medianotifier/Makefile.in
 +++ kioslave/media/medianotifier/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -160,6 +160,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -304,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33210,7 +84947,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -354,6 +358,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -361,12 +366,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,10 +389,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -560,6 +566,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -567,10 +574,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -612,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33219,7 +85020,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33233,7 +85034,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/mimetypes/Makefile.in
 +++ kioslave/media/mimetypes/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33243,7 +85052,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33252,7 +85125,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33266,7 +85139,15 @@
  mostlyclean-libtool:
 --- kioslave/media/mounthelper/Makefile.in
 +++ kioslave/media/mounthelper/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -286,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33276,7 +85157,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -336,6 +340,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -343,12 +348,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,10 +371,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -542,6 +548,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -549,10 +556,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -584,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33285,7 +85230,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33299,7 +85244,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/services/Makefile.in
 +++ kioslave/media/services/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33309,7 +85262,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33318,7 +85335,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33332,7 +85349,15 @@
  mostlyclean-libtool:
 --- kioslave/nfs/Makefile.in
 +++ kioslave/nfs/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -308,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33342,7 +85367,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -358,6 +362,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -365,12 +370,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,10 +393,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -564,6 +570,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -571,10 +578,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -612,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -33351,7 +85440,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33365,7 +85454,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/nntp/Makefile.in
 +++ kioslave/nntp/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33375,7 +85472,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -600,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33384,7 +85545,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33398,7 +85559,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/pop3/Makefile.in
 +++ kioslave/pop3/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33408,7 +85577,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -33417,7 +85650,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33431,7 +85664,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/remote/kdedmodule/Makefile.in
 +++ kioslave/remote/kdedmodule/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33441,7 +85682,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -602,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33450,7 +85755,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33464,7 +85769,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/remote/Makefile.in
 +++ kioslave/remote/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -324,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33474,7 +85787,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -632,7 +635,7 @@
+@@ -374,6 +378,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -381,12 +386,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,10 +409,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -580,6 +586,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -587,10 +594,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -632,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33483,7 +85860,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -670,9 +673,9 @@
+@@ -670,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33497,7 +85874,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/settings/Makefile.in
 +++ kioslave/settings/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -311,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33507,7 +85892,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -361,6 +365,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -368,12 +373,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -394,10 +396,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -406,6 +411,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -567,6 +573,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -574,10 +581,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -614,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -33516,7 +85965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33530,7 +85979,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/sftp/Makefile.in
 +++ kioslave/sftp/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -309,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33540,7 +85997,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -359,6 +363,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -366,12 +371,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,10 +394,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -404,6 +409,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -565,6 +571,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -572,10 +579,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33549,7 +86070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33563,7 +86084,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/smb/Makefile.in
 +++ kioslave/smb/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -308,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33573,7 +86102,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -358,6 +362,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -365,12 +370,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,10 +393,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -564,6 +570,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -571,10 +578,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -625,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33582,7 +86175,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -663,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33596,7 +86189,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/smtp/Makefile.in
 +++ kioslave/smtp/Makefile.in
-@@ -330,6 +330,9 @@
+@@ -186,6 +186,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -330,6 +331,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33606,7 +86207,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -380,6 +384,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -387,12 +392,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,10 +415,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -586,6 +592,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -593,10 +600,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -644,7 +653,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -33615,7 +86280,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -682,9 +691,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33629,7 +86294,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/system/entries/Makefile.in
 +++ kioslave/system/entries/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -120,6 +120,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -264,6 +265,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33639,7 +86312,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -314,6 +318,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -321,12 +326,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -347,10 +349,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -359,6 +364,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -520,6 +526,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -527,10 +534,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33648,7 +86385,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33662,7 +86399,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/system/kdedmodule/Makefile.in
 +++ kioslave/system/kdedmodule/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33672,7 +86417,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -602,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33681,7 +86490,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33695,7 +86504,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/system/Makefile.in
 +++ kioslave/system/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -180,6 +180,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -324,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33705,7 +86522,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -374,6 +378,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -381,12 +386,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,10 +409,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -580,6 +586,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -587,10 +594,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -631,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33714,7 +86595,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +672,9 @@
+@@ -669,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33728,7 +86609,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/system/mimetypes/Makefile.in
 +++ kioslave/system/mimetypes/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33738,7 +86627,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -33747,7 +86700,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33761,7 +86714,15 @@
  mostlyclean-libtool:
 --- kioslave/tar/Makefile.in
 +++ kioslave/tar/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33771,7 +86732,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -607,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -33780,7 +86805,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33794,7 +86819,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/thumbnail/Makefile.in
 +++ kioslave/thumbnail/Makefile.in
-@@ -342,6 +342,9 @@
+@@ -198,6 +198,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -342,6 +343,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33804,7 +86837,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -681,7 +684,7 @@
+@@ -392,6 +396,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -399,12 +404,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -425,10 +427,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -598,6 +604,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -605,10 +612,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -681,7 +690,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33813,7 +86910,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -719,9 +722,9 @@
+@@ -719,9 +728,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33827,7 +86924,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/trash/kfile-plugin/Makefile.in
 +++ kioslave/trash/kfile-plugin/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33837,7 +86942,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33846,7 +87015,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33860,7 +87029,15 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/trash/Makefile.in
 +++ kioslave/trash/Makefile.in
-@@ -330,6 +330,9 @@
+@@ -186,6 +186,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -330,6 +331,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33870,7 +87047,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -641,7 +644,7 @@
+@@ -380,6 +384,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -387,12 +392,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,10 +415,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -586,6 +592,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -593,10 +600,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -641,7 +650,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33879,7 +87120,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +682,9 @@
+@@ -679,9 +688,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33893,7 +87134,15 @@
  	@$(NORMAL_INSTALL)
 --- klipper/Makefile.in
 +++ klipper/Makefile.in
-@@ -348,6 +348,9 @@
+@@ -204,6 +204,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -348,6 +349,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33903,7 +87152,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -680,7 +683,7 @@
+@@ -398,6 +402,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -405,12 +410,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -431,10 +433,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -604,6 +610,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -611,10 +618,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -680,7 +689,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33912,7 +87225,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -718,9 +721,9 @@
+@@ -718,9 +727,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33924,91 +87237,143 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1255,18 +1258,18 @@
+@@ -1255,6 +1264,13 @@
  mocs: history.moc
  
  #>+ 3
--urlgrabber.moc: $(srcdir)/urlgrabber.h
--	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
 +configdialog.moc: $(srcdir)/configdialog.h
 +	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
- 
- #>+ 2
--mocs: urlgrabber.moc
++
++#>+ 2
 +mocs: configdialog.moc
++
++#>+ 3
+ urlgrabber.moc: $(srcdir)/urlgrabber.h
+ 	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
  
+@@ -1262,18 +1278,18 @@
+ mocs: urlgrabber.moc
+ 
  #>+ 3
 -configdialog.moc: $(srcdir)/configdialog.h
 -	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
-+urlgrabber.moc: $(srcdir)/urlgrabber.h
-+	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
  
  #>+ 2
 -mocs: configdialog.moc
-+mocs: urlgrabber.moc
++mocs: toplevel.moc
  
  #>+ 3
- clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-@@ -1305,7 +1308,7 @@
+-clipboardpoll.moc: $(srcdir)/clipboardpoll.h
+-	$(MOC) $(srcdir)/clipboardpoll.h -o clipboardpoll.moc
++popupproxy.moc: $(srcdir)/popupproxy.h
++	$(MOC) $(srcdir)/popupproxy.h -o popupproxy.moc
  
+ #>+ 2
+-mocs: clipboardpoll.moc
++mocs: popupproxy.moc
+ 
  #>+ 3
+ klipperpopup.moc: $(srcdir)/klipperpopup.h
+@@ -1283,18 +1299,11 @@
+ mocs: klipperpopup.moc
+ 
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+-
+-#>+ 2
+-mocs: toplevel.moc
+-
+-#>+ 3
+-popupproxy.moc: $(srcdir)/popupproxy.h
+-	$(MOC) $(srcdir)/popupproxy.h -o popupproxy.moc
++clipboardpoll.moc: $(srcdir)/clipboardpoll.h
++	$(MOC) $(srcdir)/clipboardpoll.h -o clipboardpoll.moc
+ 
+ #>+ 2
+-mocs: popupproxy.moc
++mocs: clipboardpoll.moc
+ 
+ #>+ 3
+ applet.moc: $(srcdir)/applet.h
+@@ -1305,7 +1314,7 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  history.moc urlgrabber.moc configdialog.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
-+	-rm -f  history.moc configdialog.moc urlgrabber.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
++	-rm -f  history.moc configdialog.moc urlgrabber.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc applet.moc
  
  #>+ 2
  KDE_DIST=popupproxy.h klipperbindings.cpp historyurlitem.h Makefile.in hisc-app-klipper.svgz historystringitem.h hi32-app-klipper.png urlgrabber.h klipperrc.upd configure.in.in configdialog.h klipper-1-2.pl history.h klippershortcuts.upd applet.h toplevel.h hi128-app-klipper.png hi48-app-klipper.png klipperrc.desktop klipperpopup.h klipper.desktop hi22-app-klipper.png hi16-app-klipper.png clipboardpoll.h klipper-kde31.sh historyitem.h hi64-app-klipper.png historyimageitem.h version.h Makefile.am 
-@@ -1321,29 +1324,29 @@
+@@ -1321,29 +1330,29 @@
  
  #>+ 25
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
  	$(INSTALL_DATA) $(srcdir)/hi22-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
  	$(INSTALL_DATA) $(srcdir)/hi64-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 +	$(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
  
  #>+ 15
  force-reedit:
-@@ -1396,7 +1399,7 @@
+@@ -1396,7 +1405,7 @@
  	rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
  
  #>+ 11
 -libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp  history.moc configdialog.moc urlgrabber.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
-+libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp  history.moc urlgrabber.moc configdialog.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
++libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp  history.moc urlgrabber.moc configdialog.moc toplevel.moc clipboardpoll.moc klipperpopup.moc popupproxy.moc
  	@echo 'creating libklipper_common_la.all_cpp.cpp ...'; \
  	rm -f libklipper_common_la.all_cpp.files libklipper_common_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
+@@ -1460,6 +1469,6 @@
+ history.lo: history.moc 
+ configdialog.lo: configdialog.moc 
+ applet.o: applet.moc 
+-clipboardpoll.o: clipboardpoll.moc 
+ klipperpopup.lo: klipperpopup.moc 
++clipboardpoll.o: clipboardpoll.moc 
+ popupproxy.lo: popupproxy.moc 
 --- kmenuedit/Makefile.in
 +++ kmenuedit/Makefile.in
-@@ -355,6 +355,9 @@
+@@ -211,6 +211,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -355,6 +356,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34018,7 +87383,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -681,7 +684,7 @@
+@@ -405,6 +409,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -412,12 +417,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -438,10 +440,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -611,6 +617,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -618,10 +625,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -681,7 +690,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34027,7 +87456,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -719,9 +722,9 @@
+@@ -719,9 +728,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34039,36 +87468,81 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1314,20 +1317,20 @@
+@@ -1282,18 +1291,18 @@
+ kcontroledit_DEPENDENCIES = libkdeinit_kcontroledit.la
  
- #>+ 16
+ #>+ 3
+-basictab.moc: $(srcdir)/basictab.h
+-	$(MOC) $(srcdir)/basictab.h -o basictab.moc
++treeview.moc: $(srcdir)/treeview.h
++	$(MOC) $(srcdir)/treeview.h -o treeview.moc
+ 
+ #>+ 2
+-mocs: basictab.moc
++mocs: treeview.moc
+ 
+ #>+ 3
+-treeview.moc: $(srcdir)/treeview.h
+-	$(MOC) $(srcdir)/treeview.h -o treeview.moc
++basictab.moc: $(srcdir)/basictab.h
++	$(MOC) $(srcdir)/basictab.h -o basictab.moc
+ 
+ #>+ 2
+-mocs: treeview.moc
++mocs: basictab.moc
+ 
+ #>+ 3
+ kmenuedit.moc: $(srcdir)/kmenuedit.h
+@@ -1304,7 +1313,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  basictab.moc treeview.moc kmenuedit.moc
++	-rm -f  treeview.moc basictab.moc kmenuedit.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in uninstall.desktop kmenuedit.desktop hi32-app-kmenuedit.png hi22-app-kmenuedit.png kmenueditui.rc hi48-app-kmenuedit.png kcontroleditui.rc hi16-app-kmenuedit.png Makefile.am 
+@@ -1316,17 +1325,17 @@
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  
  #>+ 15
- force-reedit:
+@@ -1368,7 +1377,7 @@
+ 
+ 
+ #>+ 11
+-libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp  treeview.moc basictab.moc kmenuedit.moc
++libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp  basictab.moc treeview.moc kmenuedit.moc
+ 	@echo 'creating libkmenueditcommon_la.all_cpp.cpp ...'; \
+ 	rm -f libkmenueditcommon_la.all_cpp.files libkmenueditcommon_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkmenueditcommon_la.all_cpp.final; \
 --- kmenuedit/pixmaps/Makefile.in
 +++ kmenuedit/pixmaps/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34078,7 +87552,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -546,7 +555,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -34087,7 +87625,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -584,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34099,60 +87637,65 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -736,34 +739,34 @@
- 
+@@ -737,33 +746,33 @@
  #>+ 30
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
-+	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
  	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
 -	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
--	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
  	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
 -	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
--	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
-+	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
  	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
- 	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
--	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
+ 	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
 -	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
 +	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
++	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
  	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
- 	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+-	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
--	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
+ 	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
 +	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
  
  #>+ 15
  force-reedit:
 --- knetattach/Makefile.in
 +++ knetattach/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34162,7 +87705,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34171,7 +87778,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34183,7 +87790,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -917,7 +920,7 @@
+@@ -917,7 +926,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -34192,51 +87799,52 @@
  
  #>+ 4
  clean-ui:
-@@ -929,29 +932,29 @@
+@@ -929,28 +938,28 @@
  
  #>+ 25
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
  	$(INSTALL_DATA) $(srcdir)/hi22-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  
  #>+ 15
- force-reedit:
 --- konqueror/about/Makefile.in
 +++ konqueror/about/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34246,7 +87854,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34255,7 +87927,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34269,7 +87941,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/client/Makefile.in
 +++ konqueror/client/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -173,6 +173,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -317,6 +318,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34279,7 +87959,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -367,6 +371,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -374,12 +379,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,10 +402,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -573,6 +579,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -580,10 +587,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -630,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34288,7 +88032,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -668,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34302,7 +88046,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/iconview/Makefile.in
 +++ konqueror/iconview/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34312,7 +88064,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34321,7 +88137,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34335,7 +88151,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/keditbookmarks/Makefile.in
 +++ konqueror/keditbookmarks/Makefile.in
-@@ -320,6 +320,9 @@
+@@ -176,6 +176,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -320,6 +321,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34345,7 +88169,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -638,7 +641,7 @@
+@@ -370,6 +374,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -377,12 +382,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,10 +405,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -576,6 +582,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -583,10 +590,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -638,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34354,7 +88242,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -676,9 +679,9 @@
+@@ -676,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34366,7 +88254,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1131,18 +1134,18 @@
+@@ -1131,32 +1140,32 @@
  mocs: updater.moc
  
  #>+ 3
@@ -34390,85 +88278,114 @@
 +mocs: importers.moc
  
  #>+ 3
- bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
-@@ -1152,11 +1155,11 @@
- mocs: bookmarkinfo.moc
- 
- #>+ 3
--listview.moc: $(srcdir)/listview.h
--	$(MOC) $(srcdir)/listview.h -o listview.moc
+-bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
+-	$(MOC) $(srcdir)/bookmarkinfo.h -o bookmarkinfo.moc
 +testlink.moc: $(srcdir)/testlink.h
 +	$(MOC) $(srcdir)/testlink.h -o testlink.moc
  
  #>+ 2
--mocs: listview.moc
+-mocs: bookmarkinfo.moc
 +mocs: testlink.moc
  
  #>+ 3
- dcop.moc: $(srcdir)/dcop.h
-@@ -1166,18 +1169,18 @@
- mocs: dcop.moc
+-kebsearchline.moc: $(srcdir)/kebsearchline.h
+-	$(MOC) $(srcdir)/kebsearchline.h -o kebsearchline.moc
++dcop.moc: $(srcdir)/dcop.h
++	$(MOC) $(srcdir)/dcop.h -o dcop.moc
  
+ #>+ 2
+-mocs: kebsearchline.moc
++mocs: dcop.moc
+ 
  #>+ 3
+ listview.moc: $(srcdir)/listview.h
+@@ -1166,22 +1175,22 @@
+ mocs: listview.moc
+ 
+ #>+ 3
+-dcop.moc: $(srcdir)/dcop.h
+-	$(MOC) $(srcdir)/dcop.h -o dcop.moc
++kebsearchline.moc: $(srcdir)/kebsearchline.h
++	$(MOC) $(srcdir)/kebsearchline.h -o kebsearchline.moc
+ 
+ #>+ 2
+-mocs: dcop.moc
++mocs: kebsearchline.moc
+ 
+ #>+ 3
 -testlink.moc: $(srcdir)/testlink.h
 -	$(MOC) $(srcdir)/testlink.h -o testlink.moc
-+listview.moc: $(srcdir)/listview.h
-+	$(MOC) $(srcdir)/listview.h -o listview.moc
++bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
++	$(MOC) $(srcdir)/bookmarkinfo.h -o bookmarkinfo.moc
  
  #>+ 2
 -mocs: testlink.moc
-+mocs: listview.moc
++mocs: bookmarkinfo.moc
  
  #>+ 3
  clean-metasources:
--	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc importers.moc toplevel.moc bookmarkinfo.moc listview.moc dcop.moc testlink.moc
-+	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc testlink.moc dcop.moc listview.moc
+-	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc importers.moc toplevel.moc bookmarkinfo.moc kebsearchline.moc listview.moc dcop.moc testlink.moc
++	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc testlink.moc dcop.moc listview.moc kebsearchline.moc bookmarkinfo.moc
  
  #>+ 2
--KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am 
-+KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr32-app-keditbookmarks.png cr64-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am 
+ KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am 
+@@ -1202,20 +1211,20 @@
  
- #>+ 5
- clean-idl:
-@@ -1195,20 +1198,20 @@
- 
  #>+ 16
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/cr48-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
  
  #>+ 15
  force-reedit:
-@@ -1249,7 +1252,7 @@
+@@ -1256,7 +1265,7 @@
  
  
  #>+ 11
--libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp  settings.h $(srcdir)/toplevel.cpp  settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp  settings.h  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc importers.moc toplevel.moc testlink.moc dcop.moc bookmarkinfo.moc listview.moc
-+libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp  settings.h $(srcdir)/toplevel.cpp  settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp  settings.h  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc listview.moc dcop.moc bookmarkinfo.moc testlink.moc
+-libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp  settings.h $(srcdir)/toplevel.cpp  settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp  settings.h  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc importers.moc toplevel.moc testlink.moc dcop.moc listview.moc bookmarkinfo.moc kebsearchline.moc
++libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp  settings.h $(srcdir)/toplevel.cpp  settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp  settings.h  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc kebsearchline.moc listview.moc testlink.moc dcop.moc
  	@echo 'creating libkdeinit_keditbookmarks_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_keditbookmarks_la.all_cpp.files libkdeinit_keditbookmarks_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
+@@ -1339,8 +1348,8 @@
+ nmcheck: 
+ testlink.lo: testlink.moc 
+ $(srcdir)/importers.cpp: kbookmarknotifier_stub.h settings.h 
+-bookmarkinfo.o: bookmarkinfo.moc 
+ favicons.o: favicons.moc 
++bookmarkinfo.o: bookmarkinfo.moc 
+ $(srcdir)/bookmarkinfo.cpp: kbookmarknotifier_stub.h settings.h 
+ bookmarkinfo.lo: bookmarkinfo.moc 
+ $(srcdir)/bookmarkiterator.cpp: kbookmarknotifier_stub.h settings.h 
 --- konqueror/kttsplugin/Makefile.in
 +++ konqueror/kttsplugin/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34478,7 +88395,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -596,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34487,7 +88468,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34501,7 +88482,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/listview/Makefile.in
 +++ konqueror/listview/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -163,6 +163,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -307,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34511,7 +88500,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -626,7 +629,7 @@
+@@ -357,6 +361,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -364,12 +369,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -390,10 +392,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -402,6 +407,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -563,6 +569,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -570,10 +577,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -626,7 +635,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34520,7 +88573,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +667,9 @@
+@@ -664,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34532,9 +88585,82 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -1015,13 +1024,6 @@
+ mocs: konq_infolistviewwidget.moc
+ 
+ #>+ 3
+-konq_treeviewwidget.moc: $(srcdir)/konq_treeviewwidget.h
+-	$(MOC) $(srcdir)/konq_treeviewwidget.h -o konq_treeviewwidget.moc
+-
+-#>+ 2
+-mocs: konq_treeviewwidget.moc
+-
+-#>+ 3
+ konq_textviewwidget.moc: $(srcdir)/konq_textviewwidget.h
+ 	$(MOC) $(srcdir)/konq_textviewwidget.h -o konq_textviewwidget.moc
+ 
+@@ -1029,11 +1031,11 @@
+ mocs: konq_textviewwidget.moc
+ 
+ #>+ 3
+-konq_listviewwidget.moc: $(srcdir)/konq_listviewwidget.h
+-	$(MOC) $(srcdir)/konq_listviewwidget.h -o konq_listviewwidget.moc
++konq_treeviewwidget.moc: $(srcdir)/konq_treeviewwidget.h
++	$(MOC) $(srcdir)/konq_treeviewwidget.h -o konq_treeviewwidget.moc
+ 
+ #>+ 2
+-mocs: konq_listviewwidget.moc
++mocs: konq_treeviewwidget.moc
+ 
+ #>+ 3
+ konq_listview.moc: $(srcdir)/konq_listview.h
+@@ -1043,8 +1045,15 @@
+ mocs: konq_listview.moc
+ 
+ #>+ 3
++konq_listviewwidget.moc: $(srcdir)/konq_listviewwidget.h
++	$(MOC) $(srcdir)/konq_listviewwidget.h -o konq_listviewwidget.moc
++
++#>+ 2
++mocs: konq_listviewwidget.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  konq_infolistviewwidget.moc konq_treeviewwidget.moc konq_textviewwidget.moc konq_listviewwidget.moc konq_listview.moc
++	-rm -f  konq_infolistviewwidget.moc konq_textviewwidget.moc konq_treeviewwidget.moc konq_listview.moc konq_listviewwidget.moc
+ 
+ #>+ 2
+ KDE_DIST=konq_infolistview.rc konq_detailedlistview.desktop konq_treeviewwidget.h konq_listviewitems.h konq_textview.rc Makefile.in konq_infolistviewitem.h konq_treeview.rc konq_listview.h konq_treeview.desktop konq_infolistview.desktop konq_treeviewitem.h konq_textviewitem.h konq_textviewwidget.h konq_textview.desktop konq_listview.kcfg konq_listviewsettings.kcfgc konq_infolistviewwidget.h konq_listviewwidget.h Makefile.am konq_detailedlistview.rc 
+@@ -1100,7 +1109,7 @@
+ 
+ 
+ #>+ 11
+-konq_listview_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_listview.cc  konq_listviewsettings.h $(srcdir)/konq_listviewwidget.cc  konq_listviewsettings.h $(srcdir)/konq_listviewitems.cc $(srcdir)/konq_treeviewwidget.cc $(srcdir)/konq_treeviewitem.cc $(srcdir)/konq_textviewwidget.cc $(srcdir)/konq_textviewitem.cc $(srcdir)/konq_infolistviewwidget.cc $(srcdir)/konq_infolistviewitem.cc konq_listviewsettings.cc  konq_listviewsettings.h  konq_infolistviewwidget.moc konq_textviewwidget.moc konq_treeviewwidget.moc konq_listview.moc konq_listviewwidget.moc
++konq_listview_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_listview.cc  konq_listviewsettings.h $(srcdir)/konq_listviewwidget.cc  konq_listviewsettings.h $(srcdir)/konq_listviewitems.cc $(srcdir)/konq_treeviewwidget.cc $(srcdir)/konq_treeviewitem.cc $(srcdir)/konq_textviewwidget.cc $(srcdir)/konq_textviewitem.cc $(srcdir)/konq_infolistviewwidget.cc $(srcdir)/konq_infolistviewitem.cc konq_listviewsettings.cc  konq_listviewsettings.h  konq_infolistviewwidget.moc konq_treeviewwidget.moc konq_textviewwidget.moc konq_listviewwidget.moc konq_listview.moc
+ 	@echo 'creating konq_listview_la.all_cc.cc ...'; \
+ 	rm -f konq_listview_la.all_cc.files konq_listview_la.all_cc.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> konq_listview_la.all_cc.final; \
+@@ -1149,8 +1158,8 @@
+ nmcheck-am: nmcheck
+ $(srcdir)/konq_infolistviewwidget.cc: konq_listviewsettings.h 
+ konq_textviewwidget.o: konq_textviewwidget.moc 
+-konq_listviewwidget.o: konq_listviewwidget.moc 
+ konq_textviewwidget.lo: konq_textviewwidget.moc 
++konq_listviewwidget.o: konq_listviewwidget.moc 
+ konq_listview.o: konq_listview.moc 
+ $(srcdir)/konq_infolistviewitem.cc: konq_listviewsettings.h 
+ $(srcdir)/konq_textviewwidget.cc: konq_listviewsettings.h 
 --- konqueror/Makefile.in
 +++ konqueror/Makefile.in
-@@ -364,6 +364,9 @@
+@@ -220,6 +220,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -364,6 +365,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34544,7 +88670,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -732,7 +735,7 @@
+@@ -414,6 +418,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -421,12 +426,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -447,10 +449,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -620,6 +626,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -627,10 +634,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -732,7 +741,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34553,7 +88743,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -770,9 +773,9 @@
+@@ -770,9 +779,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34565,74 +88755,60 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1484,6 +1487,13 @@
- mocs: konq_frame.moc
+@@ -1491,18 +1500,18 @@
+ mocs: konq_misc.moc
  
  #>+ 3
+-konq_browseriface.moc: $(srcdir)/konq_browseriface.h
+-	$(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
 +konq_tabs.moc: $(srcdir)/konq_tabs.h
 +	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: konq_browseriface.moc
 +mocs: konq_tabs.moc
-+
-+#>+ 3
- konq_misc.moc: $(srcdir)/konq_misc.h
- 	$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
  
-@@ -1498,11 +1508,11 @@
- mocs: konq_browseriface.moc
- 
  #>+ 3
 -konq_tabs.moc: $(srcdir)/konq_tabs.h
 -	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
-+konq_view.moc: $(srcdir)/konq_view.h
-+	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
++konq_browseriface.moc: $(srcdir)/konq_browseriface.h
++	$(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
  
  #>+ 2
 -mocs: konq_tabs.moc
-+mocs: konq_view.moc
++mocs: konq_browseriface.moc
  
  #>+ 3
  konq_run.moc: $(srcdir)/konq_run.h
-@@ -1512,13 +1522,6 @@
- mocs: konq_run.moc
+@@ -1557,7 +1566,7 @@
  
  #>+ 3
--konq_view.moc: $(srcdir)/konq_view.h
--	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
--
--#>+ 2
--mocs: konq_view.moc
--
--#>+ 3
- konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
- 	$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
- 
-@@ -1557,10 +1560,10 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_misc.moc konq_browseriface.moc konq_tabs.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
-+	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
++	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_misc.moc konq_tabs.moc konq_browseriface.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
  
  #>+ 2
--KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am 
-+KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop IDEAS konq-simplebrowser.rc konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am 
+ KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am 
+@@ -1620,7 +1629,7 @@
  
- #>+ 6
- clean-idl:
-@@ -1620,7 +1623,7 @@
  
- 
  #>+ 11
 -libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc  konq_settingsxt.h $(srcdir)/KonquerorIface.cc  konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc  konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc  konq_settingsxt.h $(srcdir)/konq_viewmgr.cc  konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc  konq_settingsxt.h $(srcdir)/konq_actions.cc  konq_settingsxt.h $(srcdir)/konq_profiledlg.cc  konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc  konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
-+libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc  konq_settingsxt.h $(srcdir)/KonquerorIface.cc  konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc  konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc  konq_settingsxt.h $(srcdir)/konq_viewmgr.cc  konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc  konq_settingsxt.h $(srcdir)/konq_actions.cc  konq_settingsxt.h $(srcdir)/konq_profiledlg.cc  konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc  konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_tabs.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
++libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc  konq_settingsxt.h $(srcdir)/KonquerorIface.cc  konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc  konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc  konq_settingsxt.h $(srcdir)/konq_viewmgr.cc  konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc  konq_settingsxt.h $(srcdir)/konq_actions.cc  konq_settingsxt.h $(srcdir)/konq_profiledlg.cc  konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc  konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_tabs.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
  	@echo 'creating libkdeinit_konqueror_la.all_cc.cc ...'; \
  	rm -f libkdeinit_konqueror_la.all_cc.files libkdeinit_konqueror_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
 --- konqueror/pics/actions/Makefile.in
 +++ konqueror/pics/actions/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34642,7 +88818,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -34651,7 +88891,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34663,34 +88903,44 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,20 +738,20 @@
+@@ -735,20 +744,20 @@
  #>+ 17
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
 -	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
  	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
- 	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+-	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
  	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
 +	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
-+	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
++	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  
  #>+ 15
  force-reedit:
 --- konqueror/pics/indicators/Makefile.in
 +++ konqueror/pics/indicators/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34700,7 +88950,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -556,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -34709,7 +89023,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34723,7 +89037,15 @@
  mostlyclean-libtool:
 --- konqueror/pics/Makefile.in
 +++ konqueror/pics/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34733,7 +89055,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -34742,7 +89128,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34754,7 +89140,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -898,39 +901,39 @@
+@@ -898,39 +907,39 @@
  
  #>+ 35
  install-kde-icons:
@@ -34763,59 +89149,67 @@
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
  	$(INSTALL_DATA) $(srcdir)/hi22-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
--	$(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
--	$(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
--	$(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
++	$(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++	$(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
++	$(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 +	$(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
  
  #>+ 15
  force-reedit:
 --- konqueror/pics/tiles/Makefile.in
 +++ konqueror/pics/tiles/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34825,7 +89219,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -556,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -34834,7 +89292,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34848,7 +89306,15 @@
  mostlyclean-libtool:
 --- konqueror/preloader/Makefile.in
 +++ konqueror/preloader/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34858,7 +89324,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34867,7 +89397,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34881,7 +89411,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/quickprint/Makefile.in
 +++ konqueror/quickprint/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34891,7 +89429,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -34900,7 +89502,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34912,18 +89514,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -760,7 +763,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-pas-print.desktop text-c++-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-css-print.desktop text-ada-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am 
-+KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-c++-print.desktop text-pas-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-ada-print.desktop text-css-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am 
- 
- #>+ 2
- docs-am:
 --- konqueror/remoteencodingplugin/Makefile.in
 +++ konqueror/remoteencodingplugin/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34933,7 +89534,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34942,7 +89607,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34956,7 +89621,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/shellcmdplugin/Makefile.in
 +++ konqueror/shellcmdplugin/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34966,7 +89639,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -604,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34975,7 +89712,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34989,7 +89726,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/Makefile.in
 +++ konqueror/sidebar/Makefile.in
-@@ -339,6 +339,9 @@
+@@ -195,6 +195,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -339,6 +340,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34999,7 +89744,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -669,7 +672,7 @@
+@@ -389,6 +393,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -396,12 +401,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -422,10 +424,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -595,6 +601,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -602,10 +609,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -669,7 +678,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35008,7 +89817,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -707,9 +710,9 @@
+@@ -707,9 +716,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35020,9 +89829,51 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -1233,18 +1242,18 @@
+ 
+ 
+ #>+ 3
+-konqsidebarplugin.moc: $(srcdir)/konqsidebarplugin.h
+-	$(MOC) $(srcdir)/konqsidebarplugin.h -o konqsidebarplugin.moc
++konqsidebar.moc: $(srcdir)/konqsidebar.h
++	$(MOC) $(srcdir)/konqsidebar.h -o konqsidebar.moc
+ 
+ #>+ 2
+-mocs: konqsidebarplugin.moc
++mocs: konqsidebar.moc
+ 
+ #>+ 3
+-konqsidebar.moc: $(srcdir)/konqsidebar.h
+-	$(MOC) $(srcdir)/konqsidebar.h -o konqsidebar.moc
++konqsidebarplugin.moc: $(srcdir)/konqsidebarplugin.h
++	$(MOC) $(srcdir)/konqsidebarplugin.h -o konqsidebarplugin.moc
+ 
+ #>+ 2
+-mocs: konqsidebar.moc
++mocs: konqsidebarplugin.moc
+ 
+ #>+ 3
+ sidebar_widget.moc: $(srcdir)/sidebar_widget.h
+@@ -1264,7 +1273,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  konqsidebarplugin.moc konqsidebar.moc sidebar_widget.moc
++	-rm -f  konqsidebar.moc konqsidebarplugin.moc sidebar_widget.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in move_konqsidebartng_entries.sh konq_sidebartng.desktop konqsidebartng.rc konqsidebartng.upd Makefile.am 
 --- konqueror/sidebar/test/Makefile.in
 +++ konqueror/sidebar/test/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -168,6 +168,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -312,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35032,7 +89883,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -362,6 +366,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -369,12 +374,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -395,10 +397,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -568,6 +574,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -575,10 +582,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -627,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35041,7 +89956,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -665,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35055,7 +89970,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/bookmark_module/Makefile.in
 +++ konqueror/sidebar/trees/bookmark_module/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35065,7 +89988,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35074,7 +90061,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35088,7 +90075,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/dirtree_module/Makefile.in
 +++ konqueror/sidebar/trees/dirtree_module/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35098,7 +90093,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -596,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35107,7 +90166,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35121,7 +90180,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/history_module/Makefile.in
 +++ konqueror/sidebar/trees/history_module/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -166,6 +166,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -310,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35131,7 +90198,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -360,6 +364,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -367,12 +372,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -393,10 +395,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -405,6 +410,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -566,6 +572,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -573,10 +580,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -621,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35140,7 +90271,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +662,9 @@
+@@ -659,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35154,7 +90285,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/init/Makefile.in
 +++ konqueror/sidebar/trees/init/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -284,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35164,7 +90303,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -334,6 +338,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -341,12 +346,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,10 +369,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -379,6 +384,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -540,6 +546,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -547,10 +554,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -588,7 +597,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -35173,7 +90376,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35187,7 +90390,15 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/remote/ftp/Makefile.in
 +++ konqueror/sidebar/trees/init/remote/ftp/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35197,7 +90408,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35206,7 +90481,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35220,7 +90495,15 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/remote/Makefile.in
 +++ konqueror/sidebar/trees/init/remote/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35230,7 +90513,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -571,7 +580,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -35239,7 +90586,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -609,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35253,7 +90600,15 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/remote/web/Makefile.in
 +++ konqueror/sidebar/trees/init/remote/web/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35263,7 +90618,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35272,7 +90691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35286,7 +90705,15 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/services/Makefile.in
 +++ konqueror/sidebar/trees/init/services/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35296,7 +90723,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35305,7 +90796,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35319,7 +90810,15 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/Makefile.in
 +++ konqueror/sidebar/trees/Makefile.in
-@@ -318,6 +318,9 @@
+@@ -174,6 +174,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -318,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35329,7 +90828,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -625,7 +628,7 @@
+@@ -368,6 +372,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -375,12 +380,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,10 +403,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -574,6 +580,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -581,10 +588,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -625,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35338,7 +90901,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +666,9 @@
+@@ -663,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35352,7 +90915,15 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/web_module/Makefile.in
 +++ konqueror/sidebar/web_module/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35362,7 +90933,79 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -392,6 +397,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = $(kde_datadir)/konqsidebartng/websidebar
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,6 @@
+ #plugin_DATA=websidebar.desktop
+ pluginadddir = $(kde_datadir)/konqsidebartng/add
+ pluginadd_DATA = webmodule_add.desktop
+-htmldir = $(kde_datadir)/konqsidebartng/websidebar
+ html_DATA = websidebar.html
+ #>- all: all-am
+ #>+ 1
+@@ -602,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35371,7 +91014,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35385,7 +91028,15 @@
  	@$(NORMAL_INSTALL)
 --- konsole/doc/Makefile.in
 +++ konsole/doc/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35395,7 +91046,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -560,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -35404,7 +91119,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35418,7 +91133,15 @@
  mostlyclean-libtool:
 --- konsole/doc/VT100/Makefile.in
 +++ konsole/doc/VT100/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35428,7 +91151,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -546,7 +555,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35437,7 +91224,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -584,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35451,7 +91238,15 @@
  mostlyclean-libtool:
 --- konsole/fonts/Makefile.in
 +++ konsole/fonts/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35461,7 +91256,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35470,7 +91329,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35484,7 +91343,15 @@
  mostlyclean-libtool:
 --- konsole/konsole/Makefile.in
 +++ konsole/konsole/Makefile.in
-@@ -357,6 +357,9 @@
+@@ -213,6 +213,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -357,6 +358,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35494,7 +91361,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -728,7 +731,7 @@
+@@ -407,6 +411,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -414,12 +419,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -440,10 +442,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -613,6 +619,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -620,10 +627,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -728,7 +737,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35503,7 +91434,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -766,9 +769,9 @@
+@@ -766,9 +775,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35515,7 +91446,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1244,18 +1247,18 @@
+@@ -1244,18 +1253,18 @@
  mocs: TEWidget.moc
  
  #>+ 3
@@ -35540,7 +91471,32 @@
  
  #>+ 3
  konsole.moc: $(srcdir)/konsole.h
-@@ -1300,18 +1303,18 @@
+@@ -1279,18 +1288,18 @@
+ mocs: zmodem_dialog.moc
+ 
+ #>+ 3
+-TEmuVt102.moc: $(srcdir)/TEmuVt102.h
+-	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
++session.moc: $(srcdir)/session.h
++	$(MOC) $(srcdir)/session.h -o session.moc
+ 
+ #>+ 2
+-mocs: TEmuVt102.moc
++mocs: session.moc
+ 
+ #>+ 3
+-session.moc: $(srcdir)/session.h
+-	$(MOC) $(srcdir)/session.h -o session.moc
++TEmuVt102.moc: $(srcdir)/TEmuVt102.h
++	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
+ 
+ #>+ 2
+-mocs: session.moc
++mocs: TEmuVt102.moc
+ 
+ #>+ 3
+ konsole_part.moc: $(srcdir)/konsole_part.h
+@@ -1300,18 +1309,18 @@
  mocs: konsole_part.moc
  
  #>+ 3
@@ -35565,25 +91521,34 @@
  
  #>+ 5
  kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
-@@ -1330,7 +1333,7 @@
+@@ -1330,7 +1339,7 @@
  
  #>+ 3
  clean-metasources:
 -	-rm -f  kwrited.moc TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc printsettings.moc
-+	-rm -f  kwrited.moc TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc printsettings.moc TEPty.moc
++	-rm -f  kwrited.moc TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc printsettings.moc TEPty.moc
  
  #>+ 2
  KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am 
-@@ -1390,7 +1393,7 @@
+@@ -1390,7 +1399,7 @@
  
  
  #>+ 11
 -libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc printsettings.moc TEPty.moc
-+libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc TEPty.moc printsettings.moc
++libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc TEPty.moc printsettings.moc
  	@echo 'creating libkdeinit_konsole_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_konsole_la.all_cpp.files libkdeinit_konsole_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_konsole_la.all_cpp.final; \
-@@ -1468,8 +1471,8 @@
+@@ -1414,7 +1423,7 @@
+ 	rm -f kded_kwrited_la.all_cpp.final kded_kwrited_la.all_cpp.files
+ 
+ #>+ 11
+-libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc
++libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc
+ 	@echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \
+ 	rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \
+@@ -1468,8 +1477,8 @@
  	@rm -f konsole$(EXEEXT)
  	$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
  
@@ -35595,7 +91560,15 @@
  nmcheck-am: nmcheck
 --- konsole/Makefile.in
 +++ konsole/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35605,7 +91578,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -601,7 +610,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -35614,7 +91651,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35628,7 +91665,15 @@
  	@$(NORMAL_INSTALL)
 --- konsole/other/icons/Makefile.in
 +++ konsole/other/icons/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35638,7 +91683,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -544,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35647,7 +91756,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35659,7 +91768,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,7 +730,7 @@
+@@ -727,46 +736,46 @@
  .NOEXPORT:
  
  #>+ 2
@@ -35668,64 +91777,74 @@
  
  #>+ 2
  docs-am:
-@@ -735,37 +738,37 @@
+ 
  #>+ 35
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
+-	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
  	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-activity.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
  	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
++	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
  	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
  	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
 +	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
 +	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
  
  #>+ 15
+ force-reedit:
 --- konsole/other/Makefile.in
 +++ konsole/other/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -279,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35735,7 +91854,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -329,6 +333,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -336,12 +341,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,10 +364,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -374,6 +379,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -535,6 +541,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -542,10 +549,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -587,7 +596,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -35744,7 +91927,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35756,7 +91939,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -966,29 +969,29 @@
+@@ -966,29 +975,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -35764,43 +91947,51 @@
 -	$(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
  	$(INSTALL_DATA) $(srcdir)/hisc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
 -	$(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
  
  #>+ 15
  force-reedit:
 --- konsole/other/wallpapers/Makefile.in
 +++ konsole/other/wallpapers/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35810,7 +92001,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35819,7 +92074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35833,7 +92088,15 @@
  mostlyclean-libtool:
 --- kpager/Makefile.in
 +++ kpager/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -155,6 +155,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -299,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35843,7 +92106,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -349,6 +353,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -356,12 +361,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -382,10 +384,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -555,6 +561,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -562,10 +569,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -603,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35852,7 +92179,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35864,36 +92191,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -971,20 +974,20 @@
- 
- #>+ 16
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
- 
- #>+ 15
- force-reedit:
 --- kpersonalizer/Makefile.in
 +++ kpersonalizer/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -173,6 +173,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -317,6 +318,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35903,7 +92211,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -647,7 +650,7 @@
+@@ -367,6 +371,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -374,12 +379,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -400,10 +402,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -573,6 +579,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -580,10 +587,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -647,7 +656,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35912,7 +92284,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -685,9 +688,9 @@
+@@ -685,9 +694,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35924,7 +92296,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1110,18 +1113,18 @@
+@@ -1110,18 +1119,18 @@
  mocs: krefinepage.moc
  
  #>+ 3
@@ -35949,7 +92321,7 @@
  
  #>+ 3
  kospage.moc: $(srcdir)/kospage.h
-@@ -1132,7 +1135,7 @@
+@@ -1132,7 +1141,7 @@
  
  #>+ 3
  clean-metasources:
@@ -35958,27 +92330,17 @@
  
  #>+ 2
  KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am 
-@@ -1152,14 +1155,14 @@
- 
- #>+ 10
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
- 
- #>+ 15
- force-reedit:
 --- kpersonalizer/pics/Makefile.in
 +++ kpersonalizer/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35988,7 +92350,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35997,7 +92423,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36011,7 +92437,15 @@
  mostlyclean-libtool:
 --- kreadconfig/Makefile.in
 +++ kreadconfig/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -148,6 +148,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -292,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36021,7 +92455,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -342,6 +346,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -349,12 +354,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,10 +377,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -548,6 +554,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -555,10 +562,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36030,7 +92528,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36044,7 +92542,15 @@
  	@$(NORMAL_INSTALL)
 --- kscreensaver/Makefile.in
 +++ kscreensaver/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36054,7 +92560,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36063,7 +92633,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36077,7 +92647,15 @@
  	@$(NORMAL_INSTALL)
 --- ksmserver/Makefile.in
 +++ ksmserver/Makefile.in
-@@ -358,6 +358,9 @@
+@@ -214,6 +214,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -358,6 +359,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36087,7 +92665,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -682,7 +685,7 @@
+@@ -408,6 +412,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -415,12 +420,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -441,10 +443,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -453,6 +458,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -614,6 +620,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -621,10 +628,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -682,7 +691,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36096,7 +92738,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -720,9 +723,9 @@
+@@ -720,9 +729,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36110,7 +92752,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/kcmksplash/Makefile.in
 +++ ksplashml/kcmksplash/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -314,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36120,7 +92770,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -364,6 +368,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -371,12 +376,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -397,10 +399,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -409,6 +414,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -570,6 +576,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -577,10 +584,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -617,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36129,7 +92843,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36143,7 +92857,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/kcmksplash/pics/Makefile.in
 +++ ksplashml/kcmksplash/pics/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36153,7 +92875,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36162,7 +92948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -581,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36174,45 +92960,48 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -733,26 +736,26 @@
- 
- #>+ 22
+@@ -735,24 +744,24 @@
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 +	$(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  
  #>+ 15
  force-reedit:
 --- ksplashml/Makefile.in
 +++ ksplashml/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -172,6 +172,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -316,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36222,7 +93011,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -366,6 +370,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -373,12 +378,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -399,10 +401,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -572,6 +578,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -579,10 +586,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -619,7 +628,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36231,7 +93084,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -657,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36245,7 +93098,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/pics/Makefile.in
 +++ ksplashml/pics/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36255,7 +93116,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -36264,7 +93189,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36278,7 +93203,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/blue-bend/Makefile.in
 +++ ksplashml/pics/themes/blue-bend/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36288,7 +93221,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36297,7 +93294,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36311,7 +93308,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/default/locolor/Makefile.in
 +++ ksplashml/pics/themes/default/locolor/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36321,7 +93326,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36330,7 +93399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36344,7 +93413,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/default/Makefile.in
 +++ ksplashml/pics/themes/default/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -133,6 +133,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -277,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36354,7 +93431,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -327,6 +331,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -334,12 +339,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,10 +362,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -372,6 +377,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -533,6 +539,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -540,10 +547,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -36363,7 +93504,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36377,7 +93518,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/Makefile.in
 +++ ksplashml/pics/themes/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36387,7 +93536,78 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,13 +564,13 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. none default simple blue-bend
++SUBDIRS =. default none blue-bend simple
+ #>- all: all-recursive
+ #>+ 1
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -36396,7 +93616,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36410,7 +93630,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/none/Makefile.in
 +++ ksplashml/pics/themes/none/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36420,7 +93648,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36429,7 +93721,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36443,7 +93735,15 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/simple/Makefile.in
 +++ ksplashml/pics/themes/simple/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36453,7 +93753,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36462,7 +93826,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36476,7 +93840,15 @@
  mostlyclean-libtool:
 --- ksplashml/themeengine/default/Makefile.in
 +++ ksplashml/themeengine/default/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36486,7 +93858,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36495,7 +93931,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36509,7 +93945,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/Makefile.in
 +++ ksplashml/themeengine/Makefile.in
-@@ -318,6 +318,9 @@
+@@ -174,6 +174,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -318,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36519,7 +93963,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -368,6 +372,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -375,12 +380,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,10 +403,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -574,6 +580,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -581,10 +588,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -622,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36528,7 +94036,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36542,7 +94050,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/redmond/Makefile.in
 +++ ksplashml/themeengine/redmond/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -172,6 +172,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -316,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36552,7 +94068,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -366,6 +370,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -373,12 +378,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -399,10 +401,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -572,6 +578,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -579,10 +586,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -620,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36561,7 +94141,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -658,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36575,7 +94155,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/redmond/pics/Makefile.in
 +++ ksplashml/themeengine/redmond/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36585,7 +94173,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36594,7 +94246,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36608,7 +94260,15 @@
  mostlyclean-libtool:
 --- ksplashml/themeengine/simple/Makefile.in
 +++ ksplashml/themeengine/simple/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -286,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36618,7 +94278,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -336,6 +340,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -343,12 +348,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,10 +371,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -542,6 +548,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -549,10 +556,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36627,7 +94351,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36641,7 +94365,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/standard/Makefile.in
 +++ ksplashml/themeengine/standard/Makefile.in
-@@ -325,6 +325,9 @@
+@@ -181,6 +181,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -325,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36651,7 +94383,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -633,7 +636,7 @@
+@@ -375,6 +379,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -382,12 +387,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -408,10 +410,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -581,6 +587,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -588,10 +595,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -633,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36660,7 +94456,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +674,9 @@
+@@ -671,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36674,7 +94470,15 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/standard/pics/Makefile.in
 +++ ksplashml/themeengine/standard/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36684,7 +94488,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -555,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36693,7 +94561,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36707,7 +94575,15 @@
  mostlyclean-libtool:
 --- kstart/Makefile.in
 +++ kstart/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -146,6 +146,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -290,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36717,7 +94593,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -340,6 +344,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -347,12 +352,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,10 +375,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -546,6 +552,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -553,10 +560,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36726,7 +94666,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36740,7 +94680,15 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/CContLib/Makefile.in
 +++ ksysguard/CContLib/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -132,6 +132,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -276,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36750,7 +94698,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -326,6 +330,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -333,12 +338,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -359,10 +361,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -371,6 +376,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -532,6 +538,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -539,10 +546,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -36759,7 +94771,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36773,7 +94785,15 @@
  clean-noinstLIBRARIES:
 --- ksysguard/example/Makefile.in
 +++ ksysguard/example/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -119,6 +119,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -263,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36783,7 +94803,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -313,6 +317,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -320,12 +325,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,10 +348,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -358,6 +363,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -519,6 +525,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -526,10 +533,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36792,7 +94876,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36806,7 +94890,15 @@
  mostlyclean-libtool:
 --- ksysguard/gui/ksgrd/Makefile.in
 +++ ksysguard/gui/ksgrd/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36816,7 +94908,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -628,7 +637,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -36825,7 +94981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -666,9 +675,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36837,7 +94993,35 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -971,13 +974,6 @@
+@@ -957,6 +966,27 @@
+ 
+ 
+ #>+ 3
++StyleSettings.moc: $(srcdir)/StyleSettings.h
++	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
++
++#>+ 2
++mocs: StyleSettings.moc
++
++#>+ 3
++HostConnector.moc: $(srcdir)/HostConnector.h
++	$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
++
++#>+ 2
++mocs: HostConnector.moc
++
++#>+ 3
++SensorAgent.moc: $(srcdir)/SensorAgent.h
++	$(MOC) $(srcdir)/SensorAgent.h -o SensorAgent.moc
++
++#>+ 2
++mocs: SensorAgent.moc
++
++#>+ 3
+ TimerSettings.moc: $(srcdir)/TimerSettings.h
+ 	$(MOC) $(srcdir)/TimerSettings.h -o TimerSettings.moc
+ 
+@@ -971,13 +1001,6 @@
  mocs: SensorSocketAgent.moc
  
  #>+ 3
@@ -36851,56 +95035,67 @@
  SensorManager.moc: $(srcdir)/SensorManager.h
  	$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
  
-@@ -985,11 +981,11 @@
- mocs: SensorManager.moc
- 
- #>+ 3
--StyleEngine.moc: $(srcdir)/StyleEngine.h
--	$(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
-+StyleSettings.moc: $(srcdir)/StyleSettings.h
-+	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
- 
- #>+ 2
--mocs: StyleEngine.moc
-+mocs: StyleSettings.moc
- 
- #>+ 3
- SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
-@@ -999,6 +995,13 @@
+@@ -999,22 +1022,8 @@
  mocs: SensorShellAgent.moc
  
  #>+ 3
-+StyleEngine.moc: $(srcdir)/StyleEngine.h
-+	$(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
-+
-+#>+ 2
-+mocs: StyleEngine.moc
-+
-+#>+ 3
- HostConnector.moc: $(srcdir)/HostConnector.h
- 	$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
- 
-@@ -1014,7 +1017,7 @@
- 
- #>+ 3
+-HostConnector.moc: $(srcdir)/HostConnector.h
+-	$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
+-
+-#>+ 2
+-mocs: HostConnector.moc
+-
+-#>+ 3
+-SensorAgent.moc: $(srcdir)/SensorAgent.h
+-	$(MOC) $(srcdir)/SensorAgent.h -o SensorAgent.moc
+-
+-#>+ 2
+-mocs: SensorAgent.moc
+-
+-#>+ 3
  clean-metasources:
 -	-rm -f  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
-+	-rm -f  TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
++	-rm -f  StyleSettings.moc HostConnector.moc SensorAgent.moc TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-@@ -1065,7 +1068,7 @@
+@@ -1065,7 +1074,7 @@
  
  
  #>+ 11
 -libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
-+libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
++libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  StyleSettings.moc HostConnector.moc SensorAgent.moc TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc
  	@echo 'creating libksgrd_la.all_cc.cc ...'; \
  	rm -f libksgrd_la.all_cc.files libksgrd_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
+@@ -1107,14 +1116,14 @@
+ StyleEngine.o: StyleEngine.moc 
+ SensorSocketAgent.lo: SensorSocketAgent.moc 
+ TimerSettings.lo: TimerSettings.moc 
+-SensorAgent.o: SensorAgent.moc 
+ SensorShellAgent.lo: SensorShellAgent.moc 
++SensorAgent.o: SensorAgent.moc 
+ SensorAgent.lo: SensorAgent.moc 
+ nmcheck: 
+ SensorManager.o: SensorManager.moc 
+ StyleEngine.lo: StyleEngine.moc 
+-TimerSettings.o: TimerSettings.moc 
+ StyleSettings.o: StyleSettings.moc 
++TimerSettings.o: TimerSettings.moc 
+ SensorManager.lo: SensorManager.moc 
+ nmcheck-am: nmcheck
+ HostConnector.lo: HostConnector.moc 
 --- ksysguard/gui/Makefile.in
 +++ ksysguard/gui/Makefile.in
-@@ -356,6 +356,9 @@
+@@ -212,6 +212,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -356,6 +357,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36910,7 +95105,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -703,7 +706,7 @@
+@@ -406,6 +410,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -413,12 +418,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -439,10 +441,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -612,6 +618,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -619,10 +626,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -703,7 +712,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -36919,7 +95178,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -741,9 +744,9 @@
+@@ -741,9 +750,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36933,7 +95192,15 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/gui/SensorDisplayLib/Makefile.in
 +++ ksysguard/gui/SensorDisplayLib/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36943,7 +95210,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -653,7 +656,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -653,7 +662,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -36952,7 +95283,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +694,9 @@
+@@ -691,9 +700,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36964,32 +95295,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -952,18 +955,18 @@
+@@ -973,18 +982,18 @@
+ mocs: DummyDisplay.moc
  
- 
  #>+ 3
--ListViewSettings.moc: $(srcdir)/ListViewSettings.h
--	$(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
-+SensorDisplay.moc: $(srcdir)/SensorDisplay.h
-+	$(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
+-FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
+-	$(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
++SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
++	$(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
  
  #>+ 2
--mocs: ListViewSettings.moc
-+mocs: SensorDisplay.moc
+-mocs: FancyPlotterSettings.moc
++mocs: SensorLoggerDlg.moc
  
  #>+ 3
--SensorDisplay.moc: $(srcdir)/SensorDisplay.h
--	$(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
-+ListViewSettings.moc: $(srcdir)/ListViewSettings.h
-+	$(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
+-SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
+-	$(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
++FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
++	$(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
  
  #>+ 2
--mocs: SensorDisplay.moc
-+mocs: ListViewSettings.moc
+-mocs: SensorLoggerDlg.moc
++mocs: FancyPlotterSettings.moc
  
  #>+ 3
- DummyDisplay.moc: $(srcdir)/DummyDisplay.h
-@@ -1015,18 +1018,18 @@
+ LogFile.moc: $(srcdir)/LogFile.h
+@@ -1015,18 +1024,18 @@
  mocs: ListView.moc
  
  #>+ 3
@@ -37014,27 +95345,35 @@
  
  #>+ 3
  DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1086,7 +1089,7 @@
+@@ -1086,7 +1095,7 @@
  
  #>+ 3
  clean-metasources:
 -	-rm -f  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
-+	-rm -f  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++	-rm -f  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
  
  #>+ 2
  KDE_DIST=SignalPlotter.h LogFile.h SensorLoggerSettings.h SensorLoggerSettingsWidget.ui FancyPlotter.h SensorLoggerDlgWidget.ui.h Makefile.in DancingBarsSettings.h BarGraph.h MultiMeterSettingsWidget.ui MultiMeter.h ListViewSettingsWidget.ui.h ProcessList.h SensorDisplay.h SensorLoggerSettingsWidget.ui.h DummyDisplay.h ReniceDlg.h DancingBars.h MultiMeterSettings.h SensorLoggerDlgWidget.ui ListView.h ListViewSettingsWidget.ui SensorLoggerDlg.h FancyPlotterSettings.h SensorLogger.h MultiMeterSettingsWidget.ui.h ProcessController.h ListViewSettings.h Makefile.am LogFileSettings.ui 
-@@ -1146,7 +1149,7 @@
+@@ -1146,7 +1155,7 @@
  
  
  #>+ 11
 -libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
-+libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
  	@echo 'creating libsensordisplays_la.all_cc.cc ...'; \
  	rm -f libsensordisplays_la.all_cc.files libsensordisplays_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
 --- ksysguard/ksysguardd/FreeBSD/Makefile.in
 +++ ksysguard/ksysguardd/FreeBSD/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -283,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37044,7 +95383,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -333,6 +337,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -340,12 +345,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -366,10 +368,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -378,6 +383,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -539,6 +545,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -546,10 +553,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37053,7 +95456,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37067,7 +95470,15 @@
  clean-noinstLIBRARIES:
 --- ksysguard/ksysguardd/Irix/Makefile.in
 +++ ksysguard/ksysguardd/Irix/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -134,6 +134,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -278,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37077,7 +95488,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -328,6 +332,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -335,12 +340,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -361,10 +363,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -373,6 +378,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -534,6 +540,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -541,10 +548,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -573,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37086,7 +95561,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37100,7 +95575,15 @@
  clean-noinstLIBRARIES:
 --- ksysguard/ksysguardd/Linux/Makefile.in
 +++ ksysguard/ksysguardd/Linux/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -284,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37110,7 +95593,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -334,6 +338,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -341,12 +346,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,10 +369,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -379,6 +384,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -540,6 +546,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -547,10 +554,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -586,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37119,7 +95666,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37133,7 +95680,15 @@
  clean-noinstLIBRARIES:
 --- ksysguard/ksysguardd/Makefile.in
 +++ ksysguard/ksysguardd/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37143,7 +95698,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -605,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37152,7 +95771,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37166,7 +95785,15 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/ksysguardd/NetBSD/Makefile.in
 +++ ksysguard/ksysguardd/NetBSD/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -139,6 +139,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -283,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37176,7 +95803,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -333,6 +337,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -340,12 +345,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -366,10 +368,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -378,6 +383,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -539,6 +545,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -546,10 +553,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -580,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37185,7 +95876,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37199,7 +95890,15 @@
  clean-noinstLIBRARIES:
 --- ksysguard/ksysguardd/OpenBSD/Makefile.in
 +++ ksysguard/ksysguardd/OpenBSD/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -132,6 +132,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -276,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37209,7 +95908,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -326,6 +330,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -333,12 +338,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -359,10 +361,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -371,6 +376,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -532,6 +538,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -539,10 +546,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -572,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37218,7 +95981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37232,7 +95995,15 @@
  clean-noinstLIBRARIES:
 --- ksysguard/ksysguardd/Solaris/Makefile.in
 +++ ksysguard/ksysguardd/Solaris/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -284,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37242,7 +96013,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -334,6 +338,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -341,12 +346,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,10 +369,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -379,6 +384,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -540,6 +546,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -547,10 +554,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -579,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37251,7 +96086,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37265,7 +96100,15 @@
  clean-noinstLIBRARIES:
 --- ksysguard/ksysguardd/Tru64/Makefile.in
 +++ ksysguard/ksysguardd/Tru64/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -142,6 +142,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -286,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37275,7 +96118,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -336,6 +340,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -343,12 +348,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,10 +371,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -542,6 +548,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -549,10 +556,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -585,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -37284,7 +96191,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37298,7 +96205,15 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/Makefile.in
 +++ ksysguard/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37308,7 +96223,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -563,7 +572,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -37317,7 +96296,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37329,7 +96308,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -901,23 +904,23 @@
+@@ -901,23 +910,23 @@
  
  #>+ 19
  install-kde-icons:
@@ -37341,30 +96320,38 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
  	$(INSTALL_DATA) $(srcdir)/cr128-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/cr48-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
  
  #>+ 15
  force-reedit:
 --- ksysguard/pics/Makefile.in
 +++ ksysguard/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37374,7 +96361,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -37383,7 +96434,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37397,7 +96448,15 @@
  mostlyclean-libtool:
 --- ksystraycmd/Makefile.in
 +++ ksystraycmd/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37407,7 +96466,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -592,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37416,7 +96539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37430,7 +96553,15 @@
  	@$(NORMAL_INSTALL)
 --- ktip/Makefile.in
 +++ ktip/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -311,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37440,7 +96571,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -361,6 +365,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -368,12 +373,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -394,10 +396,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -406,6 +411,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -567,6 +573,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -574,10 +581,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -615,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37449,7 +96644,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -653,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37461,48 +96656,63 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1088,29 +1091,29 @@
+@@ -1081,7 +1090,7 @@
+ .NOEXPORT:
  
- #>+ 25
+ #>+ 2
+-KDE_DIST=hi48-app-ktip.png hi64-app-ktip.png Makefile.in uninstall.desktop hisc-app-ktip.svgz hi22-app-ktip.png hi32-app-ktip.png hi16-app-ktip.png hi128-app-ktip.png ktip.desktop tips Makefile.am 
++KDE_DIST=hi48-app-ktip.png hi64-app-ktip.png Makefile.in uninstall.desktop hisc-app-ktip.svgz hi22-app-ktip.png hi32-app-ktip.png hi128-app-ktip.png hi16-app-ktip.png ktip.desktop tips Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+@@ -1090,27 +1099,27 @@
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
  	$(INSTALL_DATA) $(srcdir)/hi22-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 +	$(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
  
  #>+ 15
  force-reedit:
 --- ktip/pics/Makefile.in
 +++ ktip/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37512,7 +96722,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -37521,7 +96795,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37535,7 +96809,15 @@
  mostlyclean-libtool:
 --- kwin/clients/b2/config/Makefile.in
 +++ kwin/clients/b2/config/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -293,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37545,7 +96827,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -343,6 +347,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -350,12 +355,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,10 +378,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -388,6 +393,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -549,6 +555,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -556,10 +563,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37554,7 +96900,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37568,7 +96914,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/b2/Makefile.in
 +++ kwin/clients/b2/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -309,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37578,7 +96932,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -359,6 +363,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -366,12 +371,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,10 +394,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -404,6 +409,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -565,6 +571,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -572,10 +579,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -613,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37587,7 +97005,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37601,7 +97019,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/default/config/Makefile.in
 +++ kwin/clients/default/config/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -293,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37611,7 +97037,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -343,6 +347,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -350,12 +355,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,10 +378,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -388,6 +393,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -549,6 +555,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -556,10 +563,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37620,7 +97110,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37634,7 +97124,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/default/Makefile.in
 +++ kwin/clients/default/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -164,6 +164,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -308,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37644,7 +97142,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -358,6 +362,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -365,12 +370,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -391,10 +393,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -564,6 +570,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -571,10 +578,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -608,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37653,7 +97215,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37667,7 +97229,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/keramik/config/Makefile.in
 +++ kwin/clients/keramik/config/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37677,7 +97247,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -598,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37686,7 +97320,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37700,7 +97334,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/keramik/Makefile.in
 +++ kwin/clients/keramik/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -175,6 +175,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -319,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37710,7 +97352,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -628,7 +631,7 @@
+@@ -369,6 +373,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -376,12 +381,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -402,10 +404,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -575,6 +581,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -582,10 +589,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -628,7 +637,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37719,7 +97425,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +669,9 @@
+@@ -666,9 +675,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37733,7 +97439,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/kwmtheme/cli_installer/Makefile.in
 +++ kwin/clients/kwmtheme/cli_installer/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -285,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37743,7 +97457,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -335,6 +339,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -342,12 +347,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -368,10 +370,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -380,6 +385,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -541,6 +547,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -548,10 +555,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -590,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37752,7 +97530,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37766,7 +97544,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/kwmtheme/Makefile.in
 +++ kwin/clients/kwmtheme/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -309,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37776,7 +97562,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -359,6 +363,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -366,12 +371,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,10 +394,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -404,6 +409,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -565,6 +571,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -572,10 +579,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -611,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37785,7 +97635,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37799,7 +97649,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/laptop/Makefile.in
 +++ kwin/clients/laptop/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37809,7 +97667,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37818,7 +97740,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37832,7 +97754,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/Makefile.in
 +++ kwin/clients/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37842,7 +97772,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -37851,7 +97845,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37865,7 +97859,15 @@
  mostlyclean-libtool:
 --- kwin/clients/modernsystem/config/Makefile.in
 +++ kwin/clients/modernsystem/config/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -150,6 +150,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -294,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37875,7 +97877,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -344,6 +348,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -351,12 +356,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,10 +379,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -389,6 +394,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -550,6 +556,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -557,10 +564,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37884,7 +97950,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37898,7 +97964,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/modernsystem/Makefile.in
 +++ kwin/clients/modernsystem/Makefile.in
-@@ -309,6 +309,9 @@
+@@ -165,6 +165,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -309,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37908,7 +97982,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -359,6 +363,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -366,12 +371,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -392,10 +394,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -404,6 +409,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -565,6 +571,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -572,10 +579,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -612,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37917,7 +98055,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37931,7 +98069,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/plastik/config/Makefile.in
 +++ kwin/clients/plastik/config/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -152,6 +152,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -296,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37941,7 +98087,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -346,6 +350,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -353,12 +358,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -379,10 +381,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -552,6 +558,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -559,10 +566,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37950,7 +98160,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37964,7 +98174,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/plastik/Makefile.in
 +++ kwin/clients/plastik/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -169,6 +169,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -313,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37974,7 +98192,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -363,6 +367,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -370,12 +375,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -396,10 +398,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -569,6 +575,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -576,10 +583,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -617,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37983,7 +98265,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37997,7 +98279,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/quartz/config/Makefile.in
 +++ kwin/clients/quartz/config/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -149,6 +149,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -293,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38007,7 +98297,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -343,6 +347,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -350,12 +355,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -376,10 +378,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -388,6 +393,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -549,6 +555,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -556,10 +563,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -593,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38016,7 +98370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38030,7 +98384,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/quartz/Makefile.in
 +++ kwin/clients/quartz/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -167,6 +167,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -311,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38040,7 +98402,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -361,6 +365,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -368,12 +373,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -394,10 +396,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -406,6 +411,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -567,6 +573,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -574,10 +581,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -614,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38049,7 +98475,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38063,7 +98489,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/redmond/Makefile.in
 +++ kwin/clients/redmond/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38073,7 +98507,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -599,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38082,7 +98580,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38096,7 +98594,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/test/Makefile.in
 +++ kwin/clients/test/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -151,6 +151,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -295,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38106,7 +98612,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -345,6 +349,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -352,12 +357,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,10 +380,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -390,6 +395,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -551,6 +557,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -558,10 +565,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -597,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38115,7 +98685,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38129,7 +98699,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/web/Makefile.in
 +++ kwin/clients/web/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -156,6 +156,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -300,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38139,7 +98717,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -350,6 +354,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -357,12 +362,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -383,10 +385,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -556,6 +562,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -563,10 +570,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -602,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38148,7 +98790,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38162,7 +98804,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/data/Makefile.in
 +++ kwin/data/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -170,6 +170,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -314,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38172,7 +98822,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -624,7 +627,7 @@
+@@ -364,6 +368,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -371,12 +376,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -397,10 +399,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -409,6 +414,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -570,6 +576,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -577,10 +584,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -624,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38181,7 +98895,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -662,9 +665,9 @@
+@@ -662,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38195,7 +98909,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/kcmkwin/kwindecoration/Makefile.in
 +++ kwin/kcmkwin/kwindecoration/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -159,6 +159,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -303,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38205,7 +98927,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -353,6 +357,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -360,12 +365,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -386,10 +388,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -559,6 +565,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -566,10 +573,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38214,7 +99000,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38228,7 +99014,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/kcmkwin/kwinoptions/Makefile.in
 +++ kwin/kcmkwin/kwinoptions/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38238,7 +99032,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38247,7 +99105,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38261,7 +99119,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/kcmkwin/kwinrules/Makefile.in
 +++ kwin/kcmkwin/kwinrules/Makefile.in
-@@ -332,6 +332,9 @@
+@@ -188,6 +188,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -332,6 +333,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38271,7 +99137,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -658,7 +661,7 @@
+@@ -382,6 +386,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -389,12 +394,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,10 +417,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -588,6 +594,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -595,10 +602,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -658,7 +667,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38280,7 +99210,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -696,9 +699,9 @@
+@@ -696,9 +705,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38294,7 +99224,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/kcmkwin/Makefile.in
 +++ kwin/kcmkwin/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38304,7 +99242,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -38313,7 +99315,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38327,7 +99329,15 @@
  mostlyclean-libtool:
 --- kwin/killer/Makefile.in
 +++ kwin/killer/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -285,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38337,7 +99347,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -335,6 +339,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -342,12 +347,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -368,10 +370,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -380,6 +385,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -541,6 +547,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -548,10 +555,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38346,7 +99420,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38360,7 +99434,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/kompmgr/Makefile.in
 +++ kwin/kompmgr/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -132,6 +132,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -276,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38370,7 +99452,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -326,6 +330,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -333,12 +338,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -359,10 +361,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -371,6 +376,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -532,6 +538,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -539,10 +546,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -571,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -38379,7 +99525,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +612,9 @@
+@@ -609,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38393,7 +99539,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/lib/Makefile.in
 +++ kwin/lib/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -157,6 +157,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -301,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38403,7 +99557,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -351,6 +355,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -358,12 +363,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -384,10 +386,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -557,6 +563,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -564,10 +571,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -610,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38412,7 +99630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38426,7 +99644,15 @@
  	@$(NORMAL_INSTALL)
 --- kwin/Makefile.in
 +++ kwin/Makefile.in
-@@ -335,6 +335,9 @@
+@@ -191,6 +191,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -335,6 +336,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38436,7 +99662,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -659,7 +662,7 @@
+@@ -385,6 +389,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -392,12 +397,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -418,10 +420,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -591,6 +597,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -598,10 +605,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -659,7 +668,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38445,7 +99735,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -697,9 +700,9 @@
+@@ -697,9 +706,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38457,98 +99747,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1336,64 +1339,64 @@
- 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
+@@ -1396,7 +1405,7 @@
+ 	-rm -f  workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
  
- #>+ 3
--workspace.moc: $(srcdir)/workspace.h
--	$(MOC) $(srcdir)/workspace.h -o workspace.moc
-+client.moc: $(srcdir)/client.h
-+	$(MOC) $(srcdir)/client.h -o client.moc
- 
  #>+ 2
--mocs: workspace.moc
-+mocs: client.moc
+-KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png HACKING COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h 
++KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png COMPLIANCE HACKING sm.h group.h notifications.h Makefile.am tabbox.h 
  
- #>+ 3
--utils.moc: $(srcdir)/utils.h
--	$(MOC) $(srcdir)/utils.h -o utils.moc
-+workspace.moc: $(srcdir)/workspace.h
-+	$(MOC) $(srcdir)/workspace.h -o workspace.moc
+ #>+ 4
+ clean-idl:
+@@ -1408,17 +1417,17 @@
  
- #>+ 2
--mocs: utils.moc
-+mocs: workspace.moc
- 
- #>+ 3
--main.moc: $(srcdir)/main.h
--	$(MOC) $(srcdir)/main.h -o main.moc
-+tabbox.moc: $(srcdir)/tabbox.h
-+	$(MOC) $(srcdir)/tabbox.h -o tabbox.moc
- 
- #>+ 2
--mocs: main.moc
-+mocs: tabbox.moc
- 
- #>+ 3
--sm.moc: $(srcdir)/sm.h
--	$(MOC) $(srcdir)/sm.h -o sm.moc
-+utils.moc: $(srcdir)/utils.h
-+	$(MOC) $(srcdir)/utils.h -o utils.moc
- 
- #>+ 2
--mocs: sm.moc
-+mocs: utils.moc
- 
- #>+ 3
--client.moc: $(srcdir)/client.h
--	$(MOC) $(srcdir)/client.h -o client.moc
-+popupinfo.moc: $(srcdir)/popupinfo.h
-+	$(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
- 
- #>+ 2
--mocs: client.moc
-+mocs: popupinfo.moc
- 
- #>+ 3
--tabbox.moc: $(srcdir)/tabbox.h
--	$(MOC) $(srcdir)/tabbox.h -o tabbox.moc
-+geometrytip.moc: $(srcdir)/geometrytip.h
-+	$(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
- 
- #>+ 2
--mocs: tabbox.moc
-+mocs: geometrytip.moc
- 
- #>+ 3
--popupinfo.moc: $(srcdir)/popupinfo.h
--	$(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
-+main.moc: $(srcdir)/main.h
-+	$(MOC) $(srcdir)/main.h -o main.moc
- 
- #>+ 2
--mocs: popupinfo.moc
-+mocs: main.moc
- 
- #>+ 3
--geometrytip.moc: $(srcdir)/geometrytip.h
--	$(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
-+sm.moc: $(srcdir)/sm.h
-+	$(MOC) $(srcdir)/sm.h -o sm.moc
- 
- #>+ 2
--mocs: geometrytip.moc
-+mocs: sm.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
-+	-rm -f  client.moc workspace.moc tabbox.moc utils.moc popupinfo.moc geometrytip.moc main.moc sm.moc
- 
- #>+ 2
- KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png HACKING COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h 
-@@ -1408,17 +1411,17 @@
- 
  #>+ 13
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
@@ -38571,35 +99780,17 @@
  
  #>+ 15
  force-reedit:
-@@ -1459,7 +1462,7 @@
- 
- 
- #>+ 11
--libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp  client.moc workspace.moc tabbox.moc popupinfo.moc utils.moc geometrytip.moc sm.moc main.moc
-+libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp  workspace.moc utils.moc sm.moc main.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
- 	@echo 'creating libkdeinit_kwin_la.all_cpp.cpp ...'; \
- 	rm -f libkdeinit_kwin_la.all_cpp.files libkdeinit_kwin_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kwin_la.all_cpp.final; \
-@@ -1512,13 +1515,13 @@
- tabbox.lo: tabbox.moc 
- main.lo: main.moc 
- geometrytip.o: geometrytip.moc 
--client.lo: client.moc 
- utils.lo: utils.moc 
-+client.lo: client.moc 
-+main.o: main.moc 
-+utils.o: utils.moc 
- libkdeinit_kwin.la: $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_DEPENDENCIES)
- 	$(CXXLINK) -rpath $(libdir) $(libkdeinit_kwin_la_LDFLAGS) $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_LIBADD) $(LIBS)
- 
--utils.o: utils.moc 
--main.o: main.moc 
- client.o: client.moc 
- nmcheck: 
- geometrytip.lo: geometrytip.moc 
 --- kwin/oldheaders/Makefile.in
 +++ kwin/oldheaders/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -120,6 +120,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -264,6 +265,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38609,7 +99800,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -314,6 +318,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -321,12 +326,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -347,10 +349,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -359,6 +364,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -520,6 +526,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -527,10 +534,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -557,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38618,7 +99873,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38632,7 +99887,15 @@
  mostlyclean-libtool:
 --- kwin/pics/Makefile.in
 +++ kwin/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38642,7 +99905,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -558,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38651,7 +99978,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38663,7 +99990,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -758,7 +761,7 @@
+@@ -758,7 +767,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -38674,7 +100001,15 @@
  docs-am:
 --- kwin/tools/decobenchmark/Makefile.in
 +++ kwin/tools/decobenchmark/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -141,6 +141,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -285,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38684,7 +100019,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -335,6 +339,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -342,12 +347,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -368,10 +370,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -380,6 +385,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -541,6 +547,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -548,10 +555,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38693,7 +100092,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38707,7 +100106,15 @@
  clean-noinstPROGRAMS:
 --- kwin/tools/Makefile.in
 +++ kwin/tools/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -153,6 +153,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -297,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38717,7 +100124,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -347,6 +351,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -354,12 +359,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,10 +382,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -553,6 +559,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -560,10 +567,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -595,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38726,7 +100197,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38740,7 +100211,15 @@
  clean-noinstPROGRAMS:
 --- kxkb/Makefile.in
 +++ kxkb/Makefile.in
-@@ -341,6 +341,9 @@
+@@ -197,6 +197,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -341,6 +342,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38750,7 +100229,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -672,7 +675,7 @@
+@@ -391,6 +395,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -398,12 +403,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -424,10 +426,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -597,6 +603,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -604,10 +611,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -672,7 +681,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38759,7 +100302,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -710,9 +713,9 @@
+@@ -710,9 +719,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38773,7 +100316,15 @@
  	@$(NORMAL_INSTALL)
 --- kxkb/pics/Makefile.in
 +++ kxkb/pics/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38783,7 +100334,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38792,7 +100407,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -581,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38804,28 +100419,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,15 +738,15 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
- 
- #>+ 15
- force-reedit:
 --- l10n/Makefile.in
 +++ l10n/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -118,6 +118,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -262,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38835,7 +100439,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -312,6 +316,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -319,12 +324,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,10 +347,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -357,6 +362,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -518,6 +524,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -525,10 +532,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -564,7 +573,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38844,7 +100512,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -602,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38856,7 +100524,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -775,7 +778,7 @@
+@@ -775,7 +784,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -38867,7 +100535,15 @@
  docs-am:
 --- libkonq/favicons/Makefile.in
 +++ libkonq/favicons/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -158,6 +158,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -302,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38877,7 +100553,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -352,6 +356,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -359,12 +364,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -385,10 +387,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -558,6 +564,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -565,10 +572,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -607,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38886,7 +100626,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38900,7 +100640,15 @@
  	@$(NORMAL_INSTALL)
 --- libkonq/Makefile.in
 +++ libkonq/Makefile.in
-@@ -355,6 +355,9 @@
+@@ -211,6 +211,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -355,6 +356,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38910,7 +100658,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -698,7 +701,7 @@
+@@ -405,6 +409,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -412,12 +417,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -438,10 +440,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -611,6 +617,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -618,10 +625,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -698,7 +707,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -38919,7 +100731,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -736,9 +739,9 @@
+@@ -736,9 +745,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38931,7 +100743,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1362,18 +1365,18 @@
+@@ -1341,18 +1350,18 @@
+ mocs: konq_iconviewwidget.moc
+ 
+ #>+ 3
+-konq_dirpart.moc: $(srcdir)/konq_dirpart.h
+-	$(MOC) $(srcdir)/konq_dirpart.h -o konq_dirpart.moc
++konq_drag.moc: $(srcdir)/konq_drag.h
++	$(MOC) $(srcdir)/konq_drag.h -o konq_drag.moc
+ 
+ #>+ 2
+-mocs: konq_dirpart.moc
++mocs: konq_drag.moc
+ 
+ #>+ 3
+-konq_drag.moc: $(srcdir)/konq_drag.h
+-	$(MOC) $(srcdir)/konq_drag.h -o konq_drag.moc
++konq_dirpart.moc: $(srcdir)/konq_dirpart.h
++	$(MOC) $(srcdir)/konq_dirpart.h -o konq_dirpart.moc
+ 
+ #>+ 2
+-mocs: konq_drag.moc
++mocs: konq_dirpart.moc
+ 
+ #>+ 3
+ knewmenu.moc: $(srcdir)/knewmenu.h
+@@ -1362,18 +1371,18 @@
  mocs: knewmenu.moc
  
  #>+ 3
@@ -38956,25 +100793,50 @@
  
  #>+ 3
  konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1428,7 +1431,7 @@
+@@ -1390,18 +1399,18 @@
+ mocs: konq_undo.moc
  
  #>+ 3
+-konq_popupmenu.moc: $(srcdir)/konq_popupmenu.h
+-	$(MOC) $(srcdir)/konq_popupmenu.h -o konq_popupmenu.moc
++konq_bgnddlg.moc: $(srcdir)/konq_bgnddlg.h
++	$(MOC) $(srcdir)/konq_bgnddlg.h -o konq_bgnddlg.moc
+ 
+ #>+ 2
+-mocs: konq_popupmenu.moc
++mocs: konq_bgnddlg.moc
+ 
+ #>+ 3
+-konq_bgnddlg.moc: $(srcdir)/konq_bgnddlg.h
+-	$(MOC) $(srcdir)/konq_bgnddlg.h -o konq_bgnddlg.moc
++konq_popupmenu.moc: $(srcdir)/konq_popupmenu.h
++	$(MOC) $(srcdir)/konq_popupmenu.h -o konq_popupmenu.moc
+ 
+ #>+ 2
+-mocs: konq_bgnddlg.moc
++mocs: konq_popupmenu.moc
+ 
+ #>+ 13
+ konq_undo.kidl: $(srcdir)/konq_undo.h $(DCOP_DEPENDENCIES)
+@@ -1428,7 +1437,7 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
-+	-rm -f  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
++	-rm -f  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_drag.moc konq_dirpart.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
  
  #>+ 2
  KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am 
-@@ -1486,7 +1489,7 @@
+@@ -1486,7 +1495,7 @@
  
  
  #>+ 11
 -libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
-+libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
++libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_drag.moc konq_dirpart.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
  	@echo 'creating libkonq_la.all_cc.cc ...'; \
  	rm -f libkonq_la.all_cc.files libkonq_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkonq_la.all_cc.final; \
-@@ -1527,8 +1530,8 @@
+@@ -1527,8 +1536,8 @@
  konq_bgnddlg.o: konq_bgnddlg.moc 
  konq_bgnddlg.lo: konq_bgnddlg.moc 
  konq_faviconmgr.lo: konq_faviconmgr.moc 
@@ -38984,9 +100846,27 @@
  konq_filetip.lo: konq_filetip.moc 
  konq_drag.lo: konq_drag.moc 
  konq_popupmenu.o: konq_popupmenu.moc 
+@@ -1536,8 +1545,8 @@
+ konq_iconviewwidget.o: konq_iconviewwidget.moc 
+ konq_faviconmgr.o: konq_faviconmgr.moc 
+ konq_undo.o: konq_undo.moc 
+-konq_historymgr.o: konq_historymgr.moc 
+ konq_dirpart.lo: konq_dirpart.moc 
++konq_historymgr.o: konq_historymgr.moc 
+ nmcheck: 
+ konq_iconviewwidget.lo: konq_iconviewwidget.moc 
+ nmcheck-am: nmcheck
 --- libkonq/pics/Makefile.in
 +++ libkonq/pics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38996,7 +100876,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -554,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -39005,7 +100949,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39019,7 +100963,15 @@
  mostlyclean-libtool:
 --- libkonq/tests/Makefile.in
 +++ libkonq/tests/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -136,6 +136,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -280,6 +281,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39029,7 +100981,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -330,6 +334,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -337,12 +342,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -363,10 +365,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -375,6 +380,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -536,6 +542,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -543,10 +550,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -577,7 +586,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39038,7 +101054,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -615,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39052,7 +101068,15 @@
  clean-checkPROGRAMS:
 --- Makefile.in
 +++ Makefile.in
-@@ -289,6 +289,9 @@
+@@ -145,6 +145,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -289,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39062,7 +101086,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -339,6 +343,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -346,12 +351,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -372,10 +374,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -545,6 +551,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -552,10 +559,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -592,7 +601,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -39071,7 +101159,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,12 +637,12 @@
+@@ -634,12 +643,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -39086,7 +101174,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -651,7 +654,7 @@
+@@ -651,7 +660,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -39095,18 +101183,26 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -1188,7 +1191,7 @@
+@@ -1188,7 +1197,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=startkde Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in 
-+KDE_DIST=startkde stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am Makefile.am.in kdebase.lsm 
++KDE_DIST=Mainpage.dox stamp-h.in startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 configure kdebase.lsm Makefile.am.in 
  
  #>+ 2
  docs-am:
 --- nsplugins/Makefile.in
 +++ nsplugins/Makefile.in
-@@ -332,6 +332,9 @@
+@@ -188,6 +188,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -332,6 +333,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39116,7 +101212,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -653,7 +656,7 @@
+@@ -382,6 +386,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -389,12 +394,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -415,10 +417,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -588,6 +594,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -595,10 +602,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -653,7 +662,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39125,7 +101285,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +694,9 @@
+@@ -691,9 +700,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39139,7 +101299,15 @@
  	@$(NORMAL_INSTALL)
 --- nsplugins/test/Makefile.in
 +++ nsplugins/test/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -140,6 +140,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -284,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39149,7 +101317,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -334,6 +338,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -341,12 +346,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,10 +369,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -379,6 +384,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -540,6 +546,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -547,10 +554,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -582,7 +591,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39158,7 +101390,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39172,7 +101404,15 @@
  clean-checkPROGRAMS:
 --- nsplugins/viewer/Makefile.in
 +++ nsplugins/viewer/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -147,6 +147,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -291,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39182,7 +101422,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -341,6 +345,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -348,12 +353,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -374,10 +376,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -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_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -547,6 +553,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -554,10 +561,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -594,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39191,7 +101495,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39205,7 +101509,15 @@
  	@$(NORMAL_INSTALL)
 --- nsplugins/wrapper/Makefile.in
 +++ nsplugins/wrapper/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -135,6 +135,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -279,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39215,7 +101527,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -329,6 +333,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -336,12 +341,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,10 +364,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -374,6 +379,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -535,6 +541,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -542,10 +549,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -574,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -39224,7 +101600,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39238,7 +101614,15 @@
  	@$(NORMAL_INSTALL)
 --- pics/crystalsvg/Makefile.in
 +++ pics/crystalsvg/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -107,6 +107,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -251,6 +252,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39248,7 +101632,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -543,7 +546,7 @@
+@@ -301,6 +305,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -308,12 +313,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,10 +336,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -346,6 +351,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -507,6 +513,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -514,10 +521,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -543,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -39257,7 +101705,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +584,9 @@
+@@ -581,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39269,12 +101717,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,842 +729,842 @@
+@@ -726,842 +735,842 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr48-app-kbinaryclock.png cr32-app-mozilla.png cr64-app-licq.png cr32-app-xmag.png cr16-app-applixware.png cr48-app-xv.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-linuxconf.png cr48-app-package_settings.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-realplayer.png cr16-app-package_edutainment.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-mathematica.png cr32-app-gnumeric.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png crsc-app-systemtray.svgz cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr32-app-edu_science.png cr16-app-package_wordprocessing.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr64-app-phppg.png cr32-app-blender.png cr16-app-sodipodi.png cr32-app-xedit.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr16-app-licq.png cr128-app-pysol.png cr32-app-package_multimedia.png cr16-app-kvirc.png cr16-app-netscape.png cr128-app-linuxconf.png Makefile.in cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr22-app-fifteenpieces.png cr128-app-package_network.png cr32-app-pybliographic.png cr32-app-pinguin.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-mathematica.png cr16-app-pybliographic.png cr16-app-clanbomber.png cr64-app-kfm_home.png cr22-app-package_development.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png cr64-app-package.png crsc-app-quicktime.svgz cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-package_games.png cr32-app-wine.png cr64-app-wp.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr32-app-package_games_board.png crsc-app-fifteenpieces.svgz cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr64-app-taskbar.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-taskbar.png cr32-app-x.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr48-app-xemacs.png cr48-app-package.png cr64-app-gimp.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-systemtray.png cr48-app-package_games_strategy.png cr64-app-randr.png crsc-app-my_mac.svgz cr32-app-xeyes.png cr32-app-acroread.png cr16-app-evolution.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr128-app-applixware.png cr48-app-planner.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr32-app-xfig.png cr16-app-gvim.png cr16-app-linuxconf.png cr16-app-wabi.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png cr32-app-package_edutainment.png crsc-app-x.svgz cr48-app-randr.png crsc-app-camera.svgz cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr16-app-xv.png cr32-app-gabber.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr16-app-package_development.png cr64-app-xmag.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.png cr32-app-xclock.png cr22-app-taskbar.png cr32-app-wabi.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr22-app-runprocesscatcher.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr48-app-nedit.png cr128-app-penguin.png cr16-app-gaim.png cr128-app-xmag.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-abiword.png cr32-app-xemacs.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr32-app-alevt.png cr64-app-mozilla.png cr16-app-xmms.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr16-app-planner.png cr32-app-nedit.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png cr64-app-qtella.png crsc-app-package_development.svgz crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr16-app-kbinaryclock.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr48-app-package_games_card.png cr64-app-netscape.png crsc-app-kbinaryclock.svgz cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png 
-+KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-gaim.png cr48-app-xedit.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr48-app-kbinaryclock.png cr64-app-licq.png cr48-app-xv.png cr16-app-applixware.png cr32-app-xmag.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr48-app-linuxconf.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-gnumeric.png cr32-app-mathematica.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png crsc-app-systemtray.svgz cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr32-app-xedit.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr128-app-pysol.png cr16-app-licq.png crsc-app-aktion.svgz cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr22-app-fifteenpieces.png cr32-app-pybliographic.png cr32-app-pinguin.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png crsc-app-terminal.svgz cr64-app-kfm_home.png cr32-app-xapp.png cr48-app-licq.png cr48-app-xfmail.png cr64-app-applixware.png cr16-app-package_applications.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png crsc-app-quicktime.svgz cr64-app-package.png cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr64-app-wp.png cr32-app-package_games.png cr32-app-wine.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png crsc-app-fifteenpieces.svgz cr32-app-package_games_board.png cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr64-app-taskbar.png cr32-app-terminal.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr32-app-package_games_arcade.png cr48-app-mozilla.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.png cr32-app-taskbar.png cr16-app-mozilla.png cr48-app-kfm_home.png cr32-app-clanbomber.png crsc-app-xclock.svgz cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr64-app-gimp.png cr48-app-pan.png cr48-app-xemacs.png cr48-app-package.png cr48-app-pysol.png cr16-app-blender.png cr48-app-designer.png cr48-app-systemtray.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr32-app-acroread.png cr16-app-evolution.png cr32-app-xeyes.png crsc-app-shell.svgz cr16-app-acroread.png cr48-app-xchat.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-gv.png cr32-app-package_games_strategy.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr16-app-gnomemeeting.png cr16-app-xv.png cr32-app-gabber.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr48-app-kvirc.png cr128-app-mozilla.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-kfm_home.png cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr32-app-wabi.png cr22-app-taskbar.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr22-app-runprocesscatcher.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr16-app-gaim.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr48-app-package_development.png cr32-app-xmms.png cr48-app-package_toys.png crsc-app-wine.svgz cr32-app-xemacs.png cr32-app-abiword.png cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr16-app-xmms.png cr64-app-mozilla.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png cr48-app-tux.png crsc-app-error.svgz cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png crsc-app-package_development.svgz cr64-app-qtella.png crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr16-app-kbinaryclock.png cr64-app-acroread.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr32-app-galeon.png cr16-app-edu_miscellaneous.png cr48-app-dia.png cr16-app-linguist.png cr32-app-plan.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr128-app-package.png cr48-app-phppg.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr48-app-package_games_card.png cr128-app-xclock.png crsc-app-kbinaryclock.svgz cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png 
++KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr48-app-kbinaryclock.png cr32-app-mozilla.png cr64-app-licq.png cr48-app-xv.png cr32-app-xmag.png cr16-app-applixware.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr16-app-package_settings.png cr48-app-linuxconf.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr32-app-mathematica.png cr32-app-gnumeric.png cr48-app-package_games_arcade.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png crsc-app-systemtray.svgz cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_development.png cr128-app-package_utilities.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr64-app-package_multimedia.png cr48-app-galeon.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xedit.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr16-app-licq.png crsc-app-aktion.svgz cr128-app-pysol.png cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr128-app-wp.png cr64-app-package_toys.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr22-app-fifteenpieces.png cr128-app-package_network.png cr32-app-pybliographic.png cr32-app-pinguin.png cr32-app-eclipse.png cr16-app-designer.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr22-app-kvirc.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png cr64-app-kfm_home.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png cr64-app-package_favourite.png crsc-app-realplayer.svgz cr16-app-gimp.png cr64-app-package.png crsc-app-quicktime.svgz cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-wine.png cr32-app-package_games.png cr64-app-wp.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr48-app-package_games_board.png cr32-app-package_games_board.png cr64-app-penguin.png crsc-app-fifteenpieces.svgz cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr64-app-taskbar.png cr16-app-package_games.png cr16-app-package_application.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png crsc-app-xcalc.svgz cr48-app-gnucash.png cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr16-app-systemtray.png cr128-app-terminal.png cr48-app-opera.png crsc-app-core.svgz cr48-app-evolution.png crsc-app-display.svgz cr64-app-terminal.png cr32-app-taskbar.png cr32-app-x.png cr16-app-dia.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr48-app-package.png cr64-app-gimp.png cr48-app-xemacs.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-systemtray.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr16-app-evolution.png cr32-app-acroread.png cr32-app-xeyes.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png crsc-app-gnome_apps.svgz cr32-app-xcalc.png cr48-app-applixware.png cr48-app-mozilla_mail.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-linuxconf.png cr16-app-wabi.png cr32-app-package_settings.png cr32-app-xosview.png cr16-app-email.png cr32-app-vnc.png cr16-app-lyx.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr32-app-gabber.png cr16-app-xv.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr16-app-gv.png cr48-app-fifteenpieces.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-package_utilities.png cr16-app-fifteenpieces.png cr48-app-bluefish.png cr16-app-kfm_home.png cr16-app-vnc.png cr32-app-xclock.png cr16-app-package_network.png cr32-app-wabi.png cr22-app-taskbar.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr22-app-runprocesscatcher.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr16-app-gaim.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-xemacs.png cr32-app-abiword.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-abiword.png cr16-app-xcalc.png cr64-app-xclock.png cr32-app-package_applications.png cr64-app-mozilla.png cr16-app-xmms.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png cr32-app-realplayer.png crsc-app-aim.svgz cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr16-app-planner.png cr32-app-nedit.png cr128-app-netscape.png cr16-app-package.png cr16-app-package_toys.png cr32-app-package_graphics.png cr32-app-kvirc.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr32-app-xconsole.png cr128-app-package_favourite.png cr16-app-bluefish.png cr64-app-qtella.png crsc-app-package_development.svgz crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr16-app-kbinaryclock.png cr48-app-package_graphics.png crsc-app-download_manager.svgz cr32-app-wp.png cr16-app-package_graphics.png cr16-app-wp.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr48-app-package_editors.png cr128-app-package_settings.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png cr48-app-package_games_card.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr128-app-xclock.png crsc-app-kbinaryclock.svgz cr32-app-package_network.png cr16-app-terminal.png Makefile.am cr32-app-gnome_apps.png cr48-app-taskbar.png cr16-app-xload.png 
  
  #>+ 2
  docs-am:
@@ -39286,122 +101734,21 @@
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
@@ -39409,52 +101756,39 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
@@ -39470,35 +101804,84 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
--	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
@@ -39508,209 +101891,145 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
@@ -39719,11 +102038,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
@@ -39731,67 +102046,92 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
@@ -39807,12 +102147,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
@@ -39835,14 +102170,59 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
@@ -39856,14 +102236,42 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
@@ -39874,7 +102282,9 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
@@ -39905,24 +102315,31 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
  	$(INSTALL_DATA) $(srcdir)/cr32-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
@@ -39942,7 +102359,20 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
@@ -39954,33 +102384,24 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
@@ -39989,12 +102410,24 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
--	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
@@ -40004,22 +102437,42 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
@@ -40028,36 +102481,18 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
@@ -40073,11 +102508,20 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
@@ -40089,107 +102533,10 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
@@ -40197,52 +102544,34 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
@@ -40258,35 +102587,83 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
@@ -40299,55 +102676,105 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
@@ -40356,26 +102783,29 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
@@ -40383,14 +102813,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
@@ -40405,7 +102828,12 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
@@ -40417,54 +102845,74 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
@@ -40493,120 +102941,75 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
@@ -40615,7 +103018,11 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
@@ -40629,40 +103036,37 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
@@ -40670,45 +103074,55 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
@@ -40728,7 +103142,20 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
@@ -40740,33 +103167,24 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
@@ -40775,12 +103193,24 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
@@ -40790,22 +103220,42 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
@@ -40814,36 +103264,18 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
@@ -40859,17 +103291,34 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
  
  #>+ 15
  force-reedit:
 --- pics/Makefile.in
 +++ pics/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -123,6 +123,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -267,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40879,7 +103328,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -559,7 +562,7 @@
+@@ -317,6 +321,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -324,12 +329,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,10 +352,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -362,6 +367,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -523,6 +529,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -530,10 +537,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -559,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -40888,7 +103401,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +600,9 @@
+@@ -597,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40902,7 +103415,15 @@
  mostlyclean-libtool:
 --- pics/wallpapers/Makefile.in
 +++ pics/wallpapers/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -117,6 +117,7 @@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
++GREP = @GREP@
+ HALBACKEND = @HALBACKEND@
+ HAL_CFLAGS = @HAL_CFLAGS@
+ HAL_INCS = @HAL_INCS@
+@@ -261,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40912,7 +103433,71 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -311,6 +315,7 @@
+ VERSION = @VERSION@
+ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
+ XGETTEXT = @XGETTEXT@
++XMKMF = @XMKMF@
+ XMLLINT = @XMLLINT@
+ XTESTLIB = @XTESTLIB@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -318,12 +323,9 @@
+ X_LDFLAGS = @X_LDFLAGS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ X_RPATH = @X_RPATH@
+-ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,10 +346,13 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
++datarootdir = @datarootdir@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++docdir = @docdir@
+ drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
+ drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ have_xcursor_FALSE = @have_xcursor_FALSE@
+ have_xcursor_TRUE = @have_xcursor_TRUE@
+@@ -356,6 +361,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
++htmldir = @htmldir@
+ include_ARTS_FALSE = @include_ARTS_FALSE@
+ include_ARTS_TRUE = @include_ARTS_TRUE@
+ include_BZIP2_FALSE = @include_BZIP2_FALSE@
+@@ -517,6 +523,7 @@
+ libexecdir = @libexecdir@
+ libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
+ libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -524,10 +531,12 @@
+ nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
+ nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
+ pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ qt_includes = @qt_includes@
+ qt_libraries = @qt_libraries@
+ sbindir = @sbindir@
+@@ -606,7 +615,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -40921,7 +103506,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40933,3 +103518,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -806,7 +815,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=sunshine-after-the-rain.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop soft-green.jpg Won-Ton-Soup-3.jpg lineart.svgz CREDITS konqui.svgz moon.svgz.desktop soft-green.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg globe.svgz.desktop default_gears.jpg.desktop Chicken-Songs-2.jpg.desktop floating-leaves.jpg stelvio.jpg.desktop default_gears.jpg Time-For-Lunch-2.jpg.desktop here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop alta-badia.jpg.desktop alta-badia.jpg No-Ones-Laughing-3.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png aurora.svgz globe.svgz All-Good-People-1.jpg Chicken-Songs-2.jpg here-gear.svgz.desktop lineart.svgz.desktop floating-leaves.jpg.desktop sunshine-after-the-rain.jpg.desktop stelvio.jpg Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg Makefile.am KDE34.png.desktop 
++KDE_DIST=sunshine-after-the-rain.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop soft-green.jpg Won-Ton-Soup-3.jpg lineart.svgz CREDITS konqui.svgz moon.svgz.desktop soft-green.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg globe.svgz.desktop default_gears.jpg.desktop Chicken-Songs-2.jpg.desktop floating-leaves.jpg stelvio.jpg.desktop default_gears.jpg Time-For-Lunch-2.jpg.desktop here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop alta-badia.jpg.desktop alta-badia.jpg No-Ones-Laughing-3.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png aurora.svgz globe.svgz All-Good-People-1.jpg Chicken-Songs-2.jpg here-gear.svgz.desktop lineart.svgz.desktop floating-leaves.jpg.desktop stelvio.jpg sunshine-after-the-rain.jpg.desktop Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg Makefile.am KDE34.png.desktop 
+ 
+ #>+ 2
+ docs-am:




More information about the pkg-kde-commits mailing list